diff options
Diffstat (limited to 'gnu')
178 files changed, 35076 insertions, 11809 deletions
diff --git a/gnu/build/file-systems.scm b/gnu/build/file-systems.scm index ae29b36c4e..2076994e73 100644 --- a/gnu/build/file-systems.scm +++ b/gnu/build/file-systems.scm @@ -1083,6 +1083,7 @@ an exception in such cases but perform the nearest sane action." ((string-prefix? "f2fs" type) check-f2fs-file-system) ((string-prefix? "ntfs" type) check-ntfs-file-system) ((string-prefix? "nfs" type) (const 'pass)) + ((string-prefix? "cifs" type) (const 'pass)) ((string-prefix? "xfs" type) check-xfs-file-system) (else #f))) diff --git a/gnu/ci.scm b/gnu/ci.scm index 95c63067a8..4e282d197f 100644 --- a/gnu/ci.scm +++ b/gnu/ci.scm @@ -177,6 +177,13 @@ SYSTEM." "or1k-elf" "xtensa-ath9k-elf")) +(define %unsupported-platform-triplets + ;; These systems are kept around for nostalgia or for tinkering, but regular + ;; CI is disabled for them to reduce the load on CI infrastructure. + '("mips64el-linux-gnu" + "powerpc-linux-gnu" + "powerpc64-linux-gnu")) + (define (cross-jobs store system) "Return a list of cross-compilation jobs for SYSTEM." (define (from-32-to-64? target) @@ -200,6 +207,7 @@ SYSTEM." (define (pointless? target) ;; Return #t if it makes no sense to cross-build to TARGET from SYSTEM. (or (member target %bare-platform-triplets) + (member target %unsupported-platform-triplets) (match system ((or "x86_64-linux" "i686-linux") (if (string-contains target "mingw") diff --git a/gnu/local.mk b/gnu/local.mk index 7db556fa56..fac7b5973b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -814,6 +814,7 @@ GNU_SYSTEM_MODULES = \ %D%/tests/desktop.scm \ %D%/tests/dict.scm \ %D%/tests/docker.scm \ + %D%/tests/emacs.scm \ %D%/tests/file-sharing.scm \ %D%/tests/ganeti.scm \ %D%/tests/gdm.scm \ @@ -949,7 +950,6 @@ dist_patch_DATA = \ %D%/packages/patches/antlr3-3_1-fix-java8-compilation.patch \ %D%/packages/patches/antlr3-3_3-fix-java8-compilation.patch \ %D%/packages/patches/aoflagger-use-system-provided-pybind11.patch \ - %D%/packages/patches/appstream-force-reload-stemmer.patch \ %D%/packages/patches/apr-fix-atomics.patch \ %D%/packages/patches/apr-skip-getservbyname-test.patch \ %D%/packages/patches/aria2-unbundle-wslay.patch \ @@ -1023,11 +1023,13 @@ dist_patch_DATA = \ %D%/packages/patches/calls-disable-application-test.patch \ %D%/packages/patches/calls-disable-sip-test.patch \ %D%/packages/patches/camlboot-dynamically-allocate-stack-signal.patch \ + %D%/packages/patches/capstone-fix-python-constants.patch \ %D%/packages/patches/catdoc-CVE-2017-11110.patch \ %D%/packages/patches/ccextractor-add-missing-header.patch \ %D%/packages/patches/ccextractor-autoconf-tesseract.patch \ %D%/packages/patches/ccextractor-fix-ocr.patch \ %D%/packages/patches/chez-scheme-backport-configure.patch \ + %D%/packages/patches/chez-scheme-backport-signal.patch \ %D%/packages/patches/chez-scheme-bin-sh.patch \ %D%/packages/patches/circos-remove-findbin.patch \ %D%/packages/patches/cdparanoia-fpic.patch \ @@ -1064,6 +1066,7 @@ dist_patch_DATA = \ %D%/packages/patches/clang-runtime-3.7-fix-build-with-python3.patch \ %D%/packages/patches/clang-runtime-3.9-libsanitizer-mode-field.patch \ %D%/packages/patches/clang-runtime-3.8-libsanitizer-mode-field.patch \ + %D%/packages/patches/clasp-hide-event-ids.patch \ %D%/packages/patches/classpath-aarch64-support.patch \ %D%/packages/patches/classpath-miscompilation.patch \ %D%/packages/patches/cling-use-shared-library.patch \ @@ -1246,6 +1249,7 @@ dist_patch_DATA = \ %D%/packages/patches/freecad-vtk-9.3.patch \ %D%/packages/patches/freedink-engine-fix-sdl-hints.patch \ %D%/packages/patches/freeimage-libtiff-compat.patch \ + %D%/packages/patches/freeimage-libraw-0.21-compat.patch \ %D%/packages/patches/freeimage-unbundle.patch \ %D%/packages/patches/freeimage-CVE-2020-21428.patch \ %D%/packages/patches/freeimage-CVE-2020-22524.patch \ @@ -1343,6 +1347,7 @@ dist_patch_DATA = \ %D%/packages/patches/ghc-language-haskell-extract-ghc-8.10.patch \ %D%/packages/patches/ghc-memory-fix-32bit.patch \ %D%/packages/patches/ghc-persistent-fix-32bit.patch \ + %D%/packages/patches/ghc-unique-support-newer-hashable.patch \ %D%/packages/patches/ghostscript-CVE-2023-36664.patch \ %D%/packages/patches/ghostscript-CVE-2023-36664-fixup.patch \ %D%/packages/patches/ghostscript-leptonica-hurd.patch \ @@ -1466,7 +1471,6 @@ dist_patch_DATA = \ %D%/packages/patches/gtk4-respect-GUIX_GTK4_PATH.patch \ %D%/packages/patches/gtkglext-disable-disable-deprecated.patch \ %D%/packages/patches/gtksourceview-2-add-default-directory.patch \ - %D%/packages/patches/gwenview-kimageannotator.patch \ %D%/packages/patches/gzdoom-search-in-installed-share.patch \ %D%/packages/patches/gzdoom-find-system-libgme.patch \ %D%/packages/patches/hdf4-reproducibility.patch \ @@ -1636,7 +1640,6 @@ dist_patch_DATA = \ %D%/packages/patches/libofa-ftbfs-2.diff \ %D%/packages/patches/libotr-test-auth-fix.patch \ %D%/packages/patches/libksieve-Fix-missing-link-libraries.patch \ - %D%/packages/patches/libksysguard-qdiriterator-follow-symlinks.patch \ %D%/packages/patches/libmad-armv7-thumb-pt1.patch \ %D%/packages/patches/libmad-armv7-thumb-pt2.patch \ %D%/packages/patches/libmad-length-check.patch \ @@ -1734,9 +1737,6 @@ dist_patch_DATA = \ %D%/packages/patches/mia-vtk9.patch \ %D%/packages/patches/mia-vtk92.patch \ %D%/packages/patches/mia-vtk-version.patch \ - %D%/packages/patches/mingw-w64-6.0.0-gcc.patch \ - %D%/packages/patches/mingw-w64-dlltool-temp-prefix.patch \ - %D%/packages/patches/mingw-w64-reproducible-gendef.patch \ %D%/packages/patches/minisat-friend-declaration.patch \ %D%/packages/patches/minisat-install.patch \ %D%/packages/patches/miniz-for-pytorch.patch \ @@ -1945,6 +1945,8 @@ dist_patch_DATA = \ %D%/packages/patches/python-3-search-paths.patch \ %D%/packages/patches/python-3-fix-tests.patch \ %D%/packages/patches/python-3-hurd-configure.patch \ + %D%/packages/patches/python-angr-addition-type-error.patch \ + %D%/packages/patches/python-angr-check-exec-deps.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 \ @@ -1972,10 +1974,13 @@ dist_patch_DATA = \ %D%/packages/patches/python-pyan3-fix-absolute-path-bug.patch \ %D%/packages/patches/python-pyan3-fix-positional-arguments.patch \ %D%/packages/patches/python-pygpgme-fix-pinentry-tests.patch \ + %D%/packages/patches/python-pysmt-fix-pow-return-type.patch \ + %D%/packages/patches/python-pysmt-fix-smtlib-serialization-test.patch \ %D%/packages/patches/python-pytorch-fix-codegen.patch \ %D%/packages/patches/python-pytorch-runpath.patch \ %D%/packages/patches/python-pytorch-system-libraries.patch \ %D%/packages/patches/python-pytorch-without-kineto.patch \ + %D%/packages/patches/python-pyvex-remove-angr-dependency.patch \ %D%/packages/patches/python-robotframework-atest.patch \ %D%/packages/patches/python-robotframework-source-date-epoch.patch \ %D%/packages/patches/python-robotframework-sshlibrary-rf5-compat.patch \ @@ -1984,8 +1989,8 @@ dist_patch_DATA = \ %D%/packages/patches/python-unittest2-remove-argparse.patch \ %D%/packages/patches/python-vega-datasets-remove-la-riots-code.patch \ %D%/packages/patches/python-versioneer-guix-support.patch \ - %D%/packages/patches/python-waitress-fix-tests.patch \ %D%/packages/patches/python-werkzeug-tests.patch \ + %D%/packages/patches/python-xmp-toolkit-add-missing-error-codes.patch \ %D%/packages/patches/python-zeep-Fix-pytest_httpx-test-cases.patch \ %D%/packages/patches/qemu-7.2.4-build-info-manual.patch \ %D%/packages/patches/qemu-build-info-manual.patch \ @@ -2027,7 +2032,6 @@ dist_patch_DATA = \ %D%/packages/patches/rpcbind-CVE-2017-8779.patch \ %D%/packages/patches/rtags-separate-rct.patch \ %D%/packages/patches/racket-chez-scheme-bin-sh.patch \ - %D%/packages/patches/racket-backport-8.12-chez-configure.patch \ %D%/packages/patches/racket-rktio-bin-sh.patch \ %D%/packages/patches/remake-impure-dirs.patch \ %D%/packages/patches/restartd-update-robust.patch \ @@ -2055,6 +2059,7 @@ dist_patch_DATA = \ %D%/packages/patches/rust-ndarray-0.13-remove-blas-src.patch \ %D%/packages/patches/rust-ndarray-0.14-remove-blas-src.patch \ %D%/packages/patches/rust-nettle-disable-vendor.patch \ + %D%/packages/patches/rust-poem-1-fewer-deps.patch \ %D%/packages/patches/rust-rspec-1-remove-clippy.patch \ %D%/packages/patches/rust-trash-2-update-windows.patch \ %D%/packages/patches/rust-webbrowser-remove-unsupported-os.patch \ @@ -2214,6 +2219,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/virt-manager-fix-gtk-cursor-theme-backtace.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 \ @@ -2270,7 +2276,6 @@ dist_patch_DATA = \ %D%/packages/patches/xygrib-fix-finding-data.patch \ %D%/packages/patches/xygrib-newer-proj.patch \ %D%/packages/patches/yggdrasil-extra-config.patch \ - %D%/packages/patches/zathura-use-struct-initializers.patch \ %D%/packages/patches/zig-0.9-riscv-support.patch \ %D%/packages/patches/zig-do-not-link-against-librt.patch \ %D%/packages/patches/zig-use-baseline-cpu-by-default.patch \ diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index f0aa6adc85..113b8e2481 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -385,11 +385,9 @@ interface and is based on GNU Guile.") "/lib/guile/3.0/site-ccache")))))) #~%standard-phases))) - ;; Note: Use 'guile-3.0-latest' to address the continuation-related memory - ;; leak reported at <https://issues.guix.gnu.org/58631>. - (native-inputs (list pkg-config guile-3.0-latest + (native-inputs (list pkg-config guile-3.0 guile-fibers-1.1)) ;for cross-compilation - (inputs (list guile-3.0-latest guile-fibers-1.1)))) + (inputs (list guile-3.0 guile-fibers-1.1)))) (define-public shepherd-0.10 (package @@ -2716,7 +2714,7 @@ environment variable is set and output is to tty.") (define-public lr (package (name "lr") - (version "1.5.1") + (version "1.6") (source (origin (method git-fetch) @@ -2725,10 +2723,10 @@ environment variable is set and output is to tty.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1wv2acm4r5y5gg6f64v2hiwpg1f3lnr4fy1a9zssw77fmdc7ys3j")))) + (base32 "0qixmvxikyz02348xc0a718m9b1pzcazvf36rjbdk6ayn66g9hsd")))) (build-system gnu-build-system) (arguments - `(#:tests? #f + `(#:tests? #f ; There are no tests. #:make-flags (list (string-append "CC=" ,(cc-for-target)) (string-append "PREFIX=" %output)) #:phases (modify-phases %standard-phases @@ -6147,7 +6145,6 @@ file or files to several hosts.") (arguments (list #:import-path "github.com/digitalocean/doctl/cmd/doctl" #:unpack-path "github.com/digitalocean/doctl" - #:go go-1.19 #:build-flags #~(list (string-append "-ldflags=-X github.com/digitalocean/doctl.Label=release" " -X github.com/digitalocean/doctl.Major=" diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 2ce0d66894..01ef7304d9 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -1608,7 +1608,7 @@ deconvolution). Such post-processing is not performed by Stackistry.") openssl qtbase-5 qtcharts - qtlocation + qtlocation-5 qtmultimedia-5 qtpositioning qtscript diff --git a/gnu/packages/aux-files/emacs/comp-integrity-next.el b/gnu/packages/aux-files/emacs/comp-integrity-next.el new file mode 100644 index 0000000000..74ee0952f4 --- /dev/null +++ b/gnu/packages/aux-files/emacs/comp-integrity-next.el @@ -0,0 +1,121 @@ +(require 'ert) + +(eval-when-compile + (defmacro expect-feature (&optional feature) + `(progn + (eval-when-compile + (or (not ',feature) + (require ',feature))))) + + (defmacro expect-native (fun &optional feature) + `(progn + (expect-feature ,feature) + (should (native-comp-function-p (symbol-function ',fun))))) + + + (defmacro expect-native-if-bound (fun &optional feature) + `(and (expect-feature ,feature) + (boundp ',fun) + (should (native-comp-function-p (symbol-function ',fun))))) + + (defmacro expect-builtin (fun &optional feature) + `(should (primitive-function-p (symbol-function ',fun))))) + +(expect-native abbrev-mode) +(expect-native backquote-process) +(expect-native mode-line-widen) +(expect-native buffer-menu) +(expect-native button-mode) +(expect-native byte-run-strip-symbol-positions) +(expect-native case-table-get-table) +(expect-native cconv-convert) +(expect-native use-default-char-width-table) +(expect-native cl-generic-p) +(expect-native cl-struct-define) +(expect-native-if-bound x-setup-function-keys) +(expect-native encode-composition-rule) +(expect-native custom-declare-face) +(expect-native minibuffer-prompt-properties--setter) +(expect-native custom-add-choice) +(expect-native debug-early) +(expect-native display-table-slot disp-table) +(expect-native dnd-open-file) +(expect-native dos-mode25 dos-fns) +(expect-native find-file-text dos-w32) +(expect-native-if-bound dynamic-setting-handle-config-changed-event) +(expect-native easy-menu-item-present-p) +(expect-native eldoc-mode) +(expect-native electric-indent-mode) +(expect-native elisp-mode-syntax-propertize) +(expect-native getenv) +(expect-native epa-file-find-file-hook) +(expect-native face-list) +(expect-native find-file-noselect) +(expect-native fill-region) +(expect-native font-lock-change-mode) +(expect-native font-lock-add-keywords) +(expect-native-if-bound fontset-plain-name) +(expect-native format-read) +(expect-native frame-edges) +(expect-native-if-bound fringe-mode) +(expect-native help-quick) +(expect-native-if-bound image-type) +(expect-native indent-region) +(expect-native indian-compose-regexp) +(expect-native msdos-setup-keyboard term/internal) +(expect-native isearch-abort) +(expect-native iso-transl-set-language) +(expect-native jit-lock-mode) +(expect-native jka-compr-build-file-regexp) +(expect-native keymap-global-set) +(expect-native forward-sexp) +(expect-native lisp-string-in-doc-position-p) +(expect-native ls-lisp-set-options ls-lisp) +(expect-native macroexp-compiling-p) +(expect-native map-y-or-n-p) +(expect-native menu-find-file-existing) +(expect-native completion-boundaries) +(expect-native egyptian-shape-grouping) +(expect-native mouse-double-click-time) +(expect-native convert-define-charset-argument) +(expect-native coding-system-change-eol-conversion) +(expect-native store-substring mule-util) +(expect-native-if-bound mouse-wheel-change-button) +(expect-native advice-function-mapc) +(expect-native comment-string-strip) +(expect-builtin obarray-make) +(expect-native obarray-map) +(expect-native oclosure-type) +(expect-native forward-page) +(expect-native sentence-end) +(expect-native show-paren-function) +(expect-native pgtk-dnd-init-frame pgtk-dnd) +(expect-native prog-context-menu) +(expect-native-if-bound regexp-opt) +(expect-native get-register) +(expect-native query-replace-descr) +(expect-native rfn-eshadow-setup-minibuffer) +(expect-native read-multiple-choice) +(expect-native-if-bound scroll-bar-scale) +(expect-native gui-select-text) +(expect-native seq-first) +(expect-native hack-read-symbol-shorthands) +(expect-native next-error-find-buffer) +(expect-native exit-splash-screen) +(expect-native buffer-local-boundp) +(expect-native syntax-propertize-multiline) +(expect-native tab-bar-mode) +(expect-native tabulated-list-put-tag) +(expect-native text-mode) +(expect-native timer-activate) +(expect-native tool-bar-mode) +(expect-native tooltip-mode) +(expect-native tty-color-desc) +(expect-native ucs-normalize-hfs-nfd-comp-p ucs-normalize) +(expect-native uniquify-item-p) +(expect-native vc-mode) +(expect-native emacs-version) +(expect-native define-widget) +(expect-native window-right) +(expect-native x-dnd-init-frame x-dnd) +(expect-native-if-bound x-handle-no-bitmap-icon) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 637a873fbf..c5bee744dd 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -675,14 +675,13 @@ detection, and lossless compression.") (define-public borg (package (name "borg") - (version "1.2.8") + (version "1.4.0") (source (origin (method url-fetch) (uri (pypi-uri "borgbackup" version)) (sha256 - (base32 "1aplj54x6hcyg3mnzscnwi07npy7nrws2246ss25ax6bsaq257fk")) - (modules '((guix build utils))) + (base32 "0agdyrmj7yy2vn0qghcpq458v9d09q9jvzzrszz6dyj3aqalak65")) (snippet #~(begin ;; Delete files generated by Cython. We used to have a regex that @@ -701,11 +700,7 @@ detection, and lossless compression.") "src/borg/platform/linux.c" "src/borg/platform/posix.c" "src/borg/platform/syncfilerange.c" - "src/borg/platform/windows.c")) - ;; Remove bundled shared libraries. - (with-directory-excursion "src/borg/algorithms" - (for-each delete-file-recursively - (list "lz4" "xxh64" "zstd"))))))) + "src/borg/platform/windows.c")))))) (build-system python-build-system) (arguments (list @@ -716,10 +711,12 @@ detection, and lossless compression.") #~(modify-phases %standard-phases (add-after 'unpack 'set-env (lambda* (#:key inputs #:allow-other-keys) - (let ((openssl #$(this-package-input "openssl")) + (let ((acl #$(this-package-input "acl")) + (openssl #$(this-package-input "openssl")) (lz4 #$(this-package-input "lz4")) (xxhash #$(this-package-input "xxhash")) (zstd #$(this-package-input "zstd"))) + (setenv "BORG_LIBACL_PREFIX" acl) (setenv "BORG_OPENSSL_PREFIX" openssl) (setenv "BORG_LIBLZ4_PREFIX" lz4) (setenv "BORG_LIBXXHASH_PREFIX" xxhash) @@ -756,7 +753,8 @@ detection, and lossless compression.") (add-after 'install 'install-doc (lambda _ (let ((man (string-append #$output "/share/man/man1")) - (misc (string-append #$output "/share/borg/misc"))) + (misc (string-append #$output "/share/doc/borg-" + #$(package-version this-package)))) (for-each (cut install-file <> misc) '("docs/misc/create_chunker-params.txt" "docs/misc/borg-data-flow.png" @@ -952,7 +950,11 @@ is like a time machine for your data.") (search-patches "restic-0.9.6-fix-tests-for-go1.15.patch")))) (build-system go-build-system) (arguments - `(#:import-path "github.com/restic/restic" + `(;; XXX: Tests failed on a newer version of Golang, newer version of + ;; restic does not provide vendor folder any longer which means - a + ;; long way of packaging missing inputs. + #:go ,go-1.17 + #:import-path "github.com/restic/restic" ;; We don't need to install the source code for end-user applications. #:install-source? #f #:phases diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm index 1a50b78dd8..cc9969d96a 100644 --- a/gnu/packages/bioconductor.scm +++ b/gnu/packages/bioconductor.scm @@ -1932,18 +1932,18 @@ https://www.ncbi.nlm.nih.gov/geo/query/acc.cgi?acc=GSE110554.") (define-public r-genelendatabase (package (name "r-genelendatabase") - (version "1.39.0") + (version "1.40.1") (source (origin (method url-fetch) (uri (bioconductor-uri "geneLenDataBase" version 'experiment)) (sha256 - (base32 "0rdd5nq34xd85r4i4b84ibih31mq99ljvgkm7zdv4gfggrdvi6gb")))) + (base32 "0c8f0sqgrg7rc2vs9id9xzbwwv3zhy6ylqiisji20rw9ipzgv7k8")))) (properties `((upstream-name . "geneLenDataBase"))) (build-system r-build-system) (propagated-inputs - (list r-genomicfeatures r-rtracklayer)) + (list r-genomicfeatures r-rtracklayer r-txdbmaker)) (home-page "https://bioconductor.org/packages/geneLenDataBase/") (synopsis "Lengths of mRNA transcripts for a number of genomes") (description @@ -3212,13 +3212,13 @@ datasets.") (define-public r-alabaster-base (package (name "r-alabaster-base") - (version "1.4.1") + (version "1.4.2") (source (origin (method url-fetch) (uri (bioconductor-uri "alabaster.base" version)) (sha256 - (base32 "1id8cs3m1kpcfmk9aa957vy7svf7aam4kzyzic36rxcqmarr130h")))) + (base32 "1yf4j6dwva1d16fb8ss5hrpmj71azwjk9aqpad9wpnfapaldjzhb")))) (properties `((upstream-name . "alabaster.base"))) (build-system r-build-system) (inputs (list zlib)) @@ -3243,13 +3243,13 @@ applications can enrich this metadata with context-specific properties.") (define-public r-alabaster-matrix (package (name "r-alabaster-matrix") - (version "1.4.0") + (version "1.4.2") (source (origin (method url-fetch) (uri (bioconductor-uri "alabaster.matrix" version)) (sha256 - (base32 "00k0lylyhz6glqhd463bbmmldqhv5i7an9nw95md7x2m43c9gzyk")))) + (base32 "1b32qs2baq9s492a332vh1hpyxq62z16xj2w17m8wh8a4mcabry8")))) (properties `((upstream-name . "alabaster.matrix"))) (build-system r-build-system) (propagated-inputs (list r-alabaster-base @@ -3276,13 +3276,13 @@ can enrich this metadata with context-specific properties.") (define-public r-alabaster-ranges (package (name "r-alabaster-ranges") - (version "1.4.0") + (version "1.4.2") (source (origin (method url-fetch) (uri (bioconductor-uri "alabaster.ranges" version)) (sha256 - (base32 "0kjafvd4pc3bxnpjz0nvs07sdy65ad0hyzwq0nv7cifbzw9qajay")))) + (base32 "16r5wdlw2g9qnbvzpx5c5c04xa5dkwrmqlyc81iixkx6j98gsz2w")))) (properties `((upstream-name . "alabaster.ranges"))) (build-system r-build-system) (propagated-inputs (list r-alabaster-base @@ -3353,13 +3353,13 @@ handled by @code{alabaster.base}.") (define-public r-alabaster-se (package (name "r-alabaster-se") - (version "1.4.0") + (version "1.4.1") (source (origin (method url-fetch) (uri (bioconductor-uri "alabaster.se" version)) (sha256 - (base32 "15jggzbkl2v1jlng3bsqyf8sfvihn9amsbfgdygv04zh0kbx4i46")))) + (base32 "134r4pwaa4nsmdgqxs16w3adn482zl70lgyd4s96pmx7hqm9i1vx")))) (properties `((upstream-name . "alabaster.se"))) (build-system r-build-system) (propagated-inputs (list r-alabaster-base @@ -4312,13 +4312,13 @@ model as latent variables.") (define-public r-asics (package (name "r-asics") - (version "2.20.0") + (version "2.20.1") (source (origin (method url-fetch) (uri (bioconductor-uri "ASICS" version)) (sha256 (base32 - "1lqw7xmbihx9k9nm43pix0gha4j58brm0wzqf6jmag7zrgc9i6q4")))) + "0halznbl3bflnn38rh9h5a5f0dsc88n6x6kwdffbpnin9i192q1k")))) (properties `((upstream-name . "ASICS"))) (build-system r-build-system) (propagated-inputs @@ -5591,13 +5591,13 @@ make mapping WGBS data to their probe IDs easier.") (define-public r-decoupler (package (name "r-decoupler") - (version "2.9.7") + (version "2.10.0") (source (origin (method url-fetch) (uri (bioconductor-uri "decoupleR" version)) (sha256 - (base32 "0zi6shh1dn8kli66dyywwgy1s809yms0jrl6lkwvzn88rms7yaqb")))) + (base32 "060ww5hlzk0dvh7a52i1nrz1s2xq5mmlw70rxpcs6d4j08k1cmic")))) (properties `((upstream-name . "decoupleR"))) (build-system r-build-system) (propagated-inputs @@ -5743,13 +5743,13 @@ fold changes mean and variability for each selected gene.") (define-public r-delayedarray (package (name "r-delayedarray") - (version "0.30.0") + (version "0.30.1") (source (origin (method url-fetch) (uri (bioconductor-uri "DelayedArray" version)) (sha256 (base32 - "1hjkh8xsqlfwhwxs3snpx9in58plv67aj9gsw1x8842kxfric7m7")))) + "0n6pparz2fg8wgrgcwciibqz3iyrnlmk5hdvnzjppcraxanz8sm6")))) (properties `((upstream-name . "DelayedArray"))) (build-system r-build-system) @@ -5884,13 +5884,13 @@ calculation in parallel.") (define-public r-dmrcate (package (name "r-dmrcate") - (version "3.0.0") + (version "3.0.3") (source (origin (method url-fetch) (uri (bioconductor-uri "DMRcate" version)) (sha256 (base32 - "1s83p6chchsx68qsfzqclpl3wq6fqy2r3namr8l3rrxp9b49342i")))) + "0xgsbsr3g04yiyjlc161424wcvlbik208sz0rzqssw4fj255i88q")))) (properties `((upstream-name . "DMRcate"))) (build-system r-build-system) (propagated-inputs @@ -6005,13 +6005,13 @@ pseudo-cells, and downsampling of the count matrix.") (define-public r-dsb (package (name "r-dsb") - (version "1.0.3") + (version "1.0.4") (source (origin (method url-fetch) (uri (cran-uri "dsb" version)) (sha256 - (base32 "1xzhd4q04c1vql49r6m4zskpx7f5hkl5hmdgr3gsbxb73xfs51v2")))) + (base32 "16y0l3nmg88ihsr03f5n151jirypf7pxy6q0cgx2vpmdnqynlh61")))) (properties `((upstream-name . "dsb"))) (build-system r-build-system) (propagated-inputs (list r-limma r-magrittr r-mclust)) @@ -7002,13 +7002,13 @@ on Bioconductor or which replace R functions.") (define-public r-biomart (package (name "r-biomart") - (version "2.60.0") + (version "2.60.1") (source (origin (method url-fetch) (uri (bioconductor-uri "biomaRt" version)) (sha256 (base32 - "0vsjldksykgs6z7afn8kbqzl489irvvzrzq75kqkhavyhxnavqkq")))) + "0mzdxpagxwiwyznhd7h93cgy01a2j85rgb5dpnkzgp4sxw01n7rb")))) (properties `((upstream-name . "biomaRt"))) (build-system r-build-system) @@ -7137,13 +7137,13 @@ objects.") (define-public r-biostrings (package (name "r-biostrings") - (version "2.72.0") + (version "2.72.1") (source (origin (method url-fetch) (uri (bioconductor-uri "Biostrings" version)) (sha256 (base32 - "06vh7xa6lsw7y3b3z9s5266s00balr4si3l68hh15dwcsg3md6mh")))) + "067vy2v7spbdsknvi0fcpdi085kn8v20pyrhkc7wy357v21h7hgs")))) (properties `((upstream-name . "Biostrings"))) (build-system r-build-system) @@ -7271,13 +7271,13 @@ analysis.") (define-public r-champ (package (name "r-champ") - (version "2.32.0") + (version "2.34.0") (source (origin (method url-fetch) (uri (bioconductor-uri "ChAMP" version)) (sha256 (base32 - "1gdcdx34bxffd6ch354qx7yjngx3lj9chv5frwjyk56jq12vjjk7")))) + "06q539yhbmbp7qr71cwjai2vdw5nnhhjdv2ajlqmlyjpg04arc7v")))) (properties `((upstream-name . "ChAMP"))) (build-system r-build-system) (propagated-inputs @@ -7855,13 +7855,13 @@ parameter configurations.") (define-public r-enmix (package (name "r-enmix") - (version "1.40.0") + (version "1.40.2") (source (origin (method url-fetch) (uri (bioconductor-uri "ENmix" version)) (sha256 (base32 - "0cafz7bw5xha0lb3g8hfnbyj17ccb12falacxzlv4zy36mr3wxl7")))) + "1x8rzdzymibypb65axx3sgxsgrj5d1fldj9j70acvg46lqhmq8f2")))) (properties `((upstream-name . "ENmix"))) (build-system r-build-system) (propagated-inputs @@ -8119,13 +8119,13 @@ genomic intervals. In addition, it can use BAM or BigWig files as input.") (define-public r-genomeinfodb (package (name "r-genomeinfodb") - (version "1.40.0") + (version "1.40.1") (source (origin (method url-fetch) (uri (bioconductor-uri "GenomeInfoDb" version)) (sha256 (base32 - "12w3mgrv2rrlarpxws7m647akpscrqmzdsxnzl8hdicrh7wiydcx")))) + "155wj17pbdbixyg6mimv06wg3ylll8ysqh7rffjp65fw662jwhw0")))) (properties `((upstream-name . "GenomeInfoDb"))) (build-system r-build-system) @@ -8285,13 +8285,13 @@ provide added flexibility for data combination and manipulation.") (define-public r-genomicranges (package (name "r-genomicranges") - (version "1.56.0") + (version "1.56.1") (source (origin (method url-fetch) (uri (bioconductor-uri "GenomicRanges" version)) (sha256 (base32 - "18z890h4mwgizwqpz0hglgd0gmvv269cccb6i4rl3x93b519i0wx")))) + "0g0ld9i58pdxw2pwxi9nzj82mkryag457pvh6cvbvhb28pfamkma")))) (properties `((upstream-name . "GenomicRanges"))) (build-system r-build-system) @@ -8453,13 +8453,13 @@ Enrichment Analysis} (GSEA).") (define-public r-gsva (package (name "r-gsva") - (version "1.52.0") + (version "1.52.3") (source (origin (method url-fetch) (uri (bioconductor-uri "GSVA" version)) (sha256 (base32 - "10qv2m3gq5vzrqhcw1p4sx8szwl7a0kxf5n8xxhpplkxxq0yd3cn")))) + "08nxg3q350n5gf975r6b0zq4cr7lchv2i811crc4xbb7q39kw8k4")))) (properties `((upstream-name . "GSVA"))) (build-system r-build-system) (propagated-inputs (list r-biobase @@ -8494,16 +8494,16 @@ manner.") (define-public r-gypsum (package (name "r-gypsum") - (version "1.0.0") + (version "1.0.1") (source (origin (method url-fetch) (uri (bioconductor-uri "gypsum" version)) (sha256 - (base32 "0y5qpl19zpf5w3a1jhr4wgklp73izs3jrgbfi0axz1vgzkdsjss4")))) + (base32 "1zrmxmlnbiifc2p5mn10y3vpmyzqjimd2hvc3s9c0j0iv6ryxjv0")))) (properties `((upstream-name . "gypsum"))) (build-system r-build-system) - (propagated-inputs (list r-filelock r-httr2 r-jsonlite r-paws-storage)) + (propagated-inputs (list r-filelock r-httr2 r-jsonlite)) (native-inputs (list r-knitr)) (home-page "https://github.com/ArtifactDB/gypsum-R") (synopsis "Interface to the gypsum REST API") @@ -8946,14 +8946,14 @@ Shiny-based display methods for Bioconductor objects.") (define-public r-keggrest (package (name "r-keggrest") - (version "1.44.0") + (version "1.44.1") (source (origin (method url-fetch) (uri (bioconductor-uri "KEGGREST" version)) (sha256 (base32 - "1xvi11ywr3vj2m8fpqblzg2pmj1vsc0dm8fgggv6w96l6x6sfyf0")))) + "09qdsdbz5ha3b2fafwv80n6pdajjgsc5w52n1dy6ds41vxgf0jis")))) (properties `((upstream-name . "KEGGREST"))) (build-system r-build-system) (propagated-inputs @@ -9022,13 +9022,13 @@ Binomial data via estimation of latent structure in the natural parameter.") (define-public r-limma (package (name "r-limma") - (version "3.60.0") + (version "3.60.3") (source (origin (method url-fetch) (uri (bioconductor-uri "limma" version)) (sha256 (base32 - "1aizqwnyk53jsbk7g9jpcyj5004yxwslrxglhamj1c55gdcr7akg")))) + "0fy3lmjrhy7301v9far5n6c3m4n3nad463rgy2fka3bk4jls6ipg")))) (build-system r-build-system) (native-inputs (list r-knitr)) (propagated-inputs (list r-statmod)) @@ -9428,13 +9428,13 @@ time-series data (including a graphical user interface).") (define-public r-mmuphin (package (name "r-mmuphin") - (version "1.18.0") + (version "1.18.1") (source (origin (method url-fetch) (uri (bioconductor-uri "MMUPHin" version)) (sha256 - (base32 "0wvsngvxik4j1bz4w32482ffczh6qj3kzghqhh8l02cbd2908z55")) + (base32 "0wh998bjbf8zkfrzmrnm8dmm7960w5dnaq1yyc1hl105al0j33aj")) ;; Delete generated files. (snippet '(for-each delete-file @@ -11363,13 +11363,13 @@ reference point and sorted by a user defined feature.") (define-public r-sesame (package (name "r-sesame") - (version "1.22.0") + (version "1.22.2") (source (origin (method url-fetch) (uri (bioconductor-uri "sesame" version)) (sha256 (base32 - "0qz4vhz1iczz4n4wigzqkmkbsvq5ql04x1gawxv4f8ii61npp0h4")))) + "1d2vjglpbhmr4fjp3zwipf0nwj5pms4l9q1xngyxrsbr26x7jp1d")))) (properties `((upstream-name . "sesame"))) (build-system r-build-system) (propagated-inputs (list r-biocfilecache @@ -11378,7 +11378,6 @@ reference point and sorted by a user defined feature.") r-genomeinfodb r-genomicranges r-ggplot2 - r-illuminaio r-iranges r-mass r-preprocesscore @@ -12005,13 +12004,13 @@ tools either included in speaq or available elsewhere on CRAN.") (define-public r-spectra (package (name "r-spectra") - (version "1.14.0") + (version "1.14.1") (source (origin (method url-fetch) (uri (bioconductor-uri "Spectra" version)) (sha256 (base32 - "1ibbc3gkzh49cj45j2qdhsjhyrjj4ly3wckksiagc73wfag5hd2s")))) + "0mvfndd7n7varrzmv9cd3ygwbdn97x5qcgmzcxc6hr76lnkwp8al")))) (properties `((upstream-name . "Spectra"))) (build-system r-build-system) (propagated-inputs (list r-biocgenerics @@ -12060,13 +12059,13 @@ Biology at (define-public r-stringdb (package (name "r-stringdb") - (version "2.16.0") + (version "2.16.4") (source (origin (method url-fetch) (uri (bioconductor-uri "STRINGdb" version)) (sha256 - (base32 "1bn21hqvcl1a4knj7iygwqx79s49ggjaw30fj6478h7khha6556b")))) + (base32 "02fim09w9s38hvgp1g3fxqabd5r2fjysljlfrya2nr17drqkzqyx")))) (properties `((upstream-name . "STRINGdb"))) (build-system r-build-system) (propagated-inputs @@ -12334,13 +12333,13 @@ dependencies between GO terms can be implemented and applied.") (define-public r-txdbmaker (package (name "r-txdbmaker") - (version "1.0.0") + (version "1.0.1") (source (origin (method url-fetch) (uri (bioconductor-uri "txdbmaker" version)) (sha256 - (base32 "099x6v4crp953jcgqipj0001kxg7gv5h0r4mmvh1cg7j69w0zd5m")))) + (base32 "1nl7lr0x0kicd44gvwrdslcnnlmqaf57rgp1gb22yvz3lfzjziqi")))) (properties `((upstream-name . "txdbmaker"))) (build-system r-build-system) (propagated-inputs (list r-annotationdbi @@ -12659,13 +12658,13 @@ libraries for systems that do not have these available via other means.") (define-public r-zellkonverter (package (name "r-zellkonverter") - (version "1.14.0") + (version "1.14.1") (source (origin (method url-fetch) (uri (bioconductor-uri "zellkonverter" version)) (sha256 - (base32 "13qkj9adv5is4fas667kxzc2zgni3ayl5hbimakq8y4mw6qj04dn")))) + (base32 "1fyy3v1papg46cclk5fg8iqmg0671ccr82alvv41hk5d85ck04aq")))) (properties `((upstream-name . "zellkonverter"))) (build-system r-build-system) (propagated-inputs @@ -12753,14 +12752,14 @@ packages.") (define-public r-oligo (package (name "r-oligo") - (version "1.68.0") + (version "1.68.2") (source (origin (method url-fetch) (uri (bioconductor-uri "oligo" version)) (sha256 (base32 - "0mv031fsy1g3k0brxx8z7d1ryg0z2nxihrs22n6ln2jk240lkyfx")))) + "0ch6b4rg5v6fj0fgniqiigx1gnnqgwji90bxqngllman388bx867")))) (properties `((upstream-name . "oligo"))) (build-system r-build-system) (inputs (list zlib)) @@ -12789,13 +12788,13 @@ Affymetrix (CEL files) and NimbleGen arrays (XYS files).") (define-public r-qfeatures (package (name "r-qfeatures") - (version "1.14.0") + (version "1.14.1") (source (origin (method url-fetch) (uri (bioconductor-uri "QFeatures" version)) (sha256 (base32 - "0qkbbpgkrlk8k4mj3463pdcimdvpx201gk55wil6v6z56yaifsc5")))) + "1sgvabfad3zibrg449y7hw8l59yb2d8q01x7lp841m45b1g0q9d8")))) (properties `((upstream-name . "QFeatures"))) (build-system r-build-system) (propagated-inputs (list r-annotationfilter @@ -12808,6 +12807,7 @@ Affymetrix (CEL files) and NimbleGen arrays (XYS files).") r-multiassayexperiment r-plotly r-protgenerics + r-reshape2 r-s4vectors r-summarizedexperiment r-tidyr @@ -12933,13 +12933,13 @@ spectrometry} data.") (define-public r-apeglm (package (name "r-apeglm") - (version "1.26.0") + (version "1.26.1") (source (origin (method url-fetch) (uri (bioconductor-uri "apeglm" version)) (sha256 (base32 - "0l84sf4ikx0q031wf0k26n9ikwmgs4nm7v7bky47q3ik29mh7wgs")))) + "039my876v0k2mr50w90w3phj4cq55awf5ks07kr2fnm7w211gxvs")))) (properties `((upstream-name . "apeglm"))) (build-system r-build-system) (propagated-inputs @@ -13812,14 +13812,14 @@ trees and clusters to other programs.") (define-public r-goseq (package (name "r-goseq") - (version "1.54.0") + (version "1.56.0") (source (origin (method url-fetch) (uri (bioconductor-uri "goseq" version)) (sha256 (base32 - "0waw5hhxh8yab8fqw9gnd3l39s6wkmp8690rhs4llarpqz6ssrhk")))) + "0bc7dcpz0agbc42f8agf05amyhpavz55fdp622if5af5dn1ww6pr")))) (build-system r-build-system) (propagated-inputs (list r-annotationdbi @@ -14775,14 +14775,14 @@ interactive exploration of results.") (define-public r-residualmatrix (package (name "r-residualmatrix") - (version "1.14.0") + (version "1.14.1") (source (origin (method url-fetch) (uri (bioconductor-uri "ResidualMatrix" version)) (sha256 (base32 - "1q27zzl570q22nk4xjpnpa674p76hzzvilynx9i6awnzs10zjggn")))) + "1zq75i20kv0lgnh19zbhw5khxrag627ynqjvh3rj5kxbhj1l2z7c")))) (properties `((upstream-name . "ResidualMatrix"))) (build-system r-build-system) @@ -16196,14 +16196,14 @@ to multiple hypothesis correction.") (define-public r-dose (package (name "r-dose") - (version "3.30.0") + (version "3.30.1") (source (origin (method url-fetch) (uri (bioconductor-uri "DOSE" version)) (sha256 (base32 - "0hwbl3kcbjpjpdnqcq3ilk2qz3g87nybgv3kyd8fmh935jm66v6s")))) + "1kyrr1xxcif45ynyq4wsv2247bjily5sgzn17m1g3ypw2hkqcj53")))) (properties `((upstream-name . "DOSE"))) (build-system r-build-system) (propagated-inputs @@ -17664,14 +17664,14 @@ based on @dfn{Continuous Wavelet Transform} (CWT).") (define-public r-xcms (package (name "r-xcms") - (version "4.2.0") + (version "4.2.2") (source (origin (method url-fetch) (uri (bioconductor-uri "xcms" version)) (sha256 (base32 - "1cq0jk9xyk5y5mi39zi4gvrpzx65qngfml76bygkhm2lzgy3nddb")))) + "1zk9l4ll3047fj0rngvjka2hkg2by26n2h3xm1iyvfiw5068y74y")))) (build-system r-build-system) (propagated-inputs (list r-biobase @@ -19037,14 +19037,14 @@ package.") (define-public r-opencyto (package (name "r-opencyto") - (version "2.16.0") + (version "2.16.1") (source (origin (method url-fetch) (uri (bioconductor-uri "openCyto" version)) (sha256 (base32 - "08dn7k3jlicj755rwhpw48fmi9via79vd34imaffwdzq3aldi83m")))) + "13ndjvm3l5pl1jgv7bqp78didqq3rx6br4p1ncqqp68mm048f2ll")))) (properties `((upstream-name . "openCyto"))) (build-system r-build-system) (propagated-inputs @@ -20287,14 +20287,14 @@ using whole genome sequencing data.") (define-public r-activepathways (package (name "r-activepathways") - (version "2.0.3") + (version "2.0.4") (source (origin (method url-fetch) (uri (cran-uri "ActivePathways" version)) (sha256 (base32 - "0mgvxpqaq0jncr1kzmwhqkv3pajx2fz6vwhv5arw7fgla6w09p9h")))) + "07nmlkgznbv46kxy5s13bs7p3z9cxsynh6csbid6qsvqrpzv78pk")))) (properties `((upstream-name . "ActivePathways"))) (build-system r-build-system) @@ -21024,13 +21024,13 @@ different graph related packages produced by Bioconductor.") (define-public r-biocstyle (package (name "r-biocstyle") - (version "2.32.0") + (version "2.32.1") (source (origin (method url-fetch) (uri (bioconductor-uri "BiocStyle" version)) (sha256 (base32 - "1vm9wj4hzzjivdi6rnxyhxwqscdvbmc45w9zq17h3r53qnva530x")))) + "1m0nn2m548726w576mx8mx29xj428q1rkpn7z7a7m8kzgcvvgkkr")))) (properties `((upstream-name . "BiocStyle"))) (build-system r-build-system) @@ -21165,14 +21165,14 @@ db and resource files to AWS S3 buckets.") (define-public r-multiassayexperiment (package (name "r-multiassayexperiment") - (version "1.30.1") + (version "1.30.2") (source (origin (method url-fetch) (uri (bioconductor-uri "MultiAssayExperiment" version)) (sha256 (base32 - "07sfcc2cd68qmspcm4ypp3cg05d20fbpwiz5ik4lqsa0hw0j2dhw")))) + "1j74ql0lz2xf0jsf4cjfapdmxbf6hb22699d3dyj8gwd1s92myjz")))) (properties `((upstream-name . "MultiAssayExperiment"))) (build-system r-build-system) @@ -21751,13 +21751,13 @@ routines.") (define-public r-s4arrays (package (name "r-s4arrays") - (version "1.4.0") + (version "1.4.1") (source (origin (method url-fetch) (uri (bioconductor-uri "S4Arrays" version)) (sha256 (base32 - "1k7nxvlj7cjkhm0i30a93x9ll66mpci19l93qjs2540fvbp9n86y")))) + "0wdzp1q6hyks4afm217yl2n770jsqaqxix71imni1r0qbxdfkdwl")))) (properties `((upstream-name . "S4Arrays"))) (build-system r-build-system) (propagated-inputs @@ -22583,13 +22583,13 @@ variable and significantly correlated genes.") (define-public r-sparsearray (package (name "r-sparsearray") - (version "1.4.1") + (version "1.4.8") (source (origin (method url-fetch) (uri (bioconductor-uri "SparseArray" version)) (sha256 - (base32 "1kik0g208x58kycc9njp28fiacia2i8f1m5ljz9pfyw6mn1cspwm")))) + (base32 "1ahwv6ih1700h1sccv9wh7hr5bhdif0ji5jbmsprnhjxfgn6xidm")))) (properties `((upstream-name . "SparseArray"))) (build-system r-build-system) (propagated-inputs (list r-biocgenerics @@ -23320,14 +23320,14 @@ on the plot.") (define-public r-abn (package (name "r-abn") - (version "3.0.6") + (version "3.1.1") (source (origin (method url-fetch) (uri (cran-uri "abn" version)) (sha256 (base32 - "0833070j4q553kc4g5wydln3q63g0igaam9h3rbylxcs0p1v2psj")))) + "1sixgahjcy82yiiixgxiqbm8jcajqz0m3h0hwwm202iwzi3vyhiv")))) (build-system r-build-system) (inputs (list gsl)) @@ -25015,14 +25015,14 @@ embeddings and functions to build new reference.") (define-public r-tximeta (package (name "r-tximeta") - (version "1.22.0") + (version "1.22.1") (source (origin (method url-fetch) (uri (bioconductor-uri "tximeta" version)) (sha256 (base32 - "11fxd0ybp3d8l12k1f06qhnmq9s52d5g1fzc4rj20gafyy9fz496")))) + "0lmkxl7zlp6z4i32jyy914kiwacnz89jnd2kqma81mq81r389p06")))) (properties `((upstream-name . "tximeta"))) (build-system r-build-system) (propagated-inputs diff --git a/gnu/packages/books.scm b/gnu/packages/books.scm index 8255d403b2..5a6157d557 100644 --- a/gnu/packages/books.scm +++ b/gnu/packages/books.scm @@ -42,7 +42,7 @@ (define-public book-sparc (package (name "book-sparc") - (version "2.0.0") + (version "2.1.0") (source (origin (method git-fetch) (uri (git-reference @@ -50,7 +50,7 @@ (commit (string-append "v" version)))) (sha256 (base32 - "0bn3a3m0kcjybyaz1a7pj8n48jh1cg4szwi9px3zjhhm5818wi7z")) + "1ns2vs5yb9z1hj9gq5y55qz7c9azzhr866b665s8fq50q5m4yhbc")) (file-name (git-file-name name version)) (modules '((guix build utils))) (snippet @@ -78,6 +78,7 @@ (list font-liberation texlive-acronym texlive-adjustbox + texlive-biblatex texlive-bibtex texlive-bibtexperllibs texlive-bigfoot diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index cc973837a3..4072df50d7 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -53,6 +53,7 @@ #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) #:use-module (gnu packages linux) + #:use-module (gnu packages llvm) #:use-module (gnu packages man) #:use-module (gnu packages mtools) #:use-module (gnu packages ncurses) @@ -132,7 +133,17 @@ ;; Counterintuitively, this *disables* a spurious Python dependency by ;; calling the ‘true’ binary instead. Python is only needed during ;; bootstrapping (for genptl.py), not when building from a release. - #~(list "PYTHON=true") + #~(append + (list "PYTHON=true") + ;; This needs to be compiled with clang for powerpc64le. + (if #$(and=> (%current-target-system) + target-ppc64le?) + (list "TARGET_CC=powerpc64le-linux-gnu-clang") + '()) + (if #$(and (target-ppc64le? (%current-system)) + (not (%current-target-system))) + (list "CC=clang") + '())) ;; GRUB fails to load modules stripped with --strip-unneeded. #:strip-flags @@ -185,6 +196,13 @@ (substitute* "Makefile.in" (("grub_cmd_date grub_cmd_set_date grub_cmd_sleep") "grub_cmd_date grub_cmd_sleep")))) + #$@(if (target-ppc64le?) + #~((add-before 'check 'skip-tests + (lambda _ + (substitute* "Makefile.in" + ((" grub_cmd_date ") " ") + ((" pseries_test ") " "))))) + #~()) (add-before 'check 'disable-pixel-perfect-test (lambda _ ;; This test compares many screenshots rendered with an older @@ -204,6 +222,15 @@ ;; is required for generating alternative keyboard layouts. console-setup) + ;; 64-bit PowerPC hardware boots in big-endian mode and then for + ;; powerpc64le it switches to little-endian mode. Therefore we + ;; need a compiler which can generate both big-endian and + ;; little-endian binaries for the bootloader and the utilities + ;; and building with clang is the easiest option. + (if (target-ppc64le?) + (list clang) + '()) + ;; Depend on LVM2 for libdevmapper, used by 'grub-probe' and ;; 'grub-install' to recognize mapped devices (LUKS, etc.) (if (member (or (%current-target-system) @@ -286,10 +313,7 @@ menu to select one of the installed operating systems.") (delete "help2man" "texinfo" "parted" "qemu" "xorriso"))) (arguments (substitute-keyword-arguments (package-arguments grub) - ((#:configure-flags _ #~'()) - #~(list "PYTHON=true")) - ((#:tests? _ #t) - #f) + ((#:tests? _ #t) #f) ((#:phases phases #~%standard-phases) #~(modify-phases #$phases (replace 'patch-stuff diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 550a5d0f1d..412b94569c 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -73,6 +73,7 @@ #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages bash) + #:use-module (gnu packages boost) #:use-module (gnu packages cmake) #:use-module (gnu packages compression) #:use-module (gnu packages cpp) @@ -87,6 +88,7 @@ #:use-module (gnu packages guile) #:use-module (gnu packages guile-xyz) #:use-module (gnu packages maths) + #:use-module (gnu packages ncurses) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) @@ -989,6 +991,63 @@ macros for defining tests, grouping them into suites, and providing a test runner. It is quite unopinionated with most of its features being optional.") (license license:isc))) +(define-public klee-uclibc + (let ((commit "955d502cc1f0688e82348304b053ad787056c754")) + (package + (name "klee-uclibc") + (version (git-version "20230612" "0" commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/klee/klee-uclibc") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "12fnr5mq80cxwvv09gi844mi31jgi8067swagxnlxlhxj4mi125j")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ;upstream uClibc tests do not work in the fork + #:strip-directories '() ;only ships a static library, so don't strip anything. + #:phases (modify-phases %standard-phases + ;; Disable locales as these would have to be downloaded and + ;; shouldn't really be needed for symbolic execution either. + (add-after 'unpack 'patch-config + (lambda _ + (substitute* "klee-premade-configs/x86_64/config" + (("UCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA=y") + "UCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA=n") + (("UCLIBC_PREGENERATED_LOCALE_DATA=y") + "UCLIBC_PREGENERATED_LOCALE_DATA=n") + (("UCLIBC_HAS_LOCALE=y") + "UCLIBC_HAS_LOCALE=n") + (("UCLIBC_HAS_XLOCALE=y") + "UCLIBC_HAS_XLOCALE=n")))) + + ;; Upstream uses a custom non-GNU configure script written + ;; in Python, replace the default configure phase accordingly. + (replace 'configure + (lambda _ + (invoke "./configure" "--make-llvm-lib" + "--enable-release"))) + + ;; Custom install phase to only install the libc.a file manually. + ;; This is the only file which is used/needed by KLEE itself. + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (install-file "lib/libc.a" + (string-append (assoc-ref outputs "out") + "/lib/klee"))))))) + ;; ncurses is only needed for the `make menuconfig` interface. + (native-inputs (list clang-13 llvm-13 python ncurses)) + (synopsis "Variant of uClibc tailored to symbolic execution") + (description + "Modified version of uClibc for symbolic execution of +Unix userland software. This library can only be used in conjunction +with the @code{klee} package.") + (home-page "https://klee-se.org/") + (license license:lgpl2.1)))) + (define-public klee (package (name "klee") @@ -1004,13 +1063,32 @@ runner. It is quite unopinionated with most of its features being optional.") (base32 "1nma6dqi8chjb97llsa8mzyskgsg4dx56lm8j514j5wmr8vkafz6")))) (arguments (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch + (lambda _ + (substitute* "CMakeLists.txt" + (("\\$\\{KLEE_UCLIBC_PATH\\}/lib/libc\\.a") + "${KLEE_UCLIBC_PATH}")))) + (add-after 'install 'wrap-hooks + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin")) + (lib (string-append out "/lib"))) + ;; Ensure that KLEE finds runtime libraries (e.g. uclibc). + (wrap-program (string-append bin "/klee") + `("KLEE_RUNTIME_LIBRARY_PATH" = + (,(string-append lib "/klee/runtime/")))))))) #:configure-flags #~(list (string-append "-DLLVMCC=" (search-input-file %build-inputs "/bin/clang")) (string-append "-DLLVMCXX=" - (search-input-file %build-inputs "/bin/clang++"))))) + (search-input-file %build-inputs "/bin/clang++")) + (string-append "-DKLEE_UCLIBC_PATH=" + (search-input-file %build-inputs "/lib/klee/libc.a")) + "-DENABLE_POSIX_RUNTIME=ON"))) (native-inputs (list clang-13 llvm-13 python-lit)) - (inputs (list gperftools sqlite z3)) + (inputs (list bash-minimal klee-uclibc gperftools sqlite z3)) (build-system cmake-build-system) (home-page "https://klee-se.org/") (synopsis "Symbolic execution engine") @@ -3396,8 +3474,8 @@ provides a simple way to achieve this.") (license license:gpl2))) (define-public rapidcheck - (let ((commit "a5724ea5b0b00147109b0605c377f1e54c353ba2") - (revision "0")) + (let ((commit "ff6af6fc683159deb51c543b065eba14dfcf329b") + (revision "1")) (package (name "rapidcheck") (version (git-version "0.0.0" revision commit)) @@ -3410,24 +3488,39 @@ provides a simple way to achieve this.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "0f2dmsym8ibnwkaidxmgp73mg0sdniwsyn6ppskh74246h29bbcy")))) + (base32 "1s2qva1amhs887jcdj12ppxk9kkfvy25xy7vzhkwb7rljr3gj713")) + (modules '((guix build utils))) + (snippet + #~(begin + (make-file-writable "ext/CMakeLists.txt") + (call-with-output-file "ext/CMakeLists.txt" + (lambda (out) + (display "find_package(Catch2 REQUIRED GLOBAL)\n" out) + (display "find_package(GTest GLOBAL)\n" out) + (display "find_package(Boost GLOBAL)\n" out))) + (substitute* "extras/boost/test/CMakeLists.txt" + (("^([ ]*)boost" all spaces) + (string-append spaces "Boost::boost"))) + ;; Disable tests failing on Apple M1 and Hetzner CAX41 (aarch64). + ;; Upstream issue: https://github.com/emil-e/rapidcheck/issues/328 + (substitute* "test/gen/NumericTests.cpp" + (("forEachType<SignedProperties.*") "")) + (substitute* "test/shrink/ShrinkTests.cpp" + (("forEachType<SignedIntegralProperties.*") "")))))) (arguments (list - #:tests? #f ;require fetching submodules - #:configure-flags #~(list "-DCMAKE_POSITION_INDEPENDENT_CODE=ON") - #:phases - #~(modify-phases %standard-phases - (add-after 'install 'install-extra-headers - (lambda _ - (with-directory-excursion "../source/extras" - (for-each - (lambda (dir) - (let ((dir (string-append dir "/include/rapidcheck/")) - (dest (string-append #$output - "/include/rapidcheck"))) - (copy-recursively dir dest))) - '("boost" "boost_test" "catch" "gmock" "gtest")))))))) + #:configure-flags #~(list "-DCMAKE_POSITION_INDEPENDENT_CODE=ON" + "-DRC_ENABLE_BOOST=on" + "-DRC_ENABLE_CATCH=on" + "-DRC_ENABLE_DOCTEST=on" + "-DRC_ENABLE_GTEST=on" + "-DRC_ENABLE_TESTS=on"))) (build-system cmake-build-system) + (inputs (list boost + catch2 + doctest + googletest)) + (native-inputs (list catch2 googletest)) (home-page "https://github.com/emil-e/rapidcheck") (synopsis "Property based testing framework for C++") (description "Rapidcheck is a property based testing framework for C++. diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm index db582fa821..47edc56e87 100644 --- a/gnu/packages/chez.scm +++ b/gnu/packages/chez.scm @@ -130,8 +130,9 @@ Scheme machine types, or '#f' if none is defined." #f) ((target-ppc32? system) "ppc32") - ((target-riscv64? system) - "rv64") + ;; This is apparently not ready in chez-scheme-for-racket. + ;((target-riscv64? system) + ; "rv64") ((string-prefix? "loongarch64-" system) "la64") (else @@ -297,7 +298,7 @@ will name the threaded machine type unless THREADS? is provided as #f." (name "chez-scheme-for-racket") ;; The version should match `(scheme-version-number #t)`. ;; See s/cmacros.ss c. line 360. - (version "9.9.9-pre-release.23") + (version "10.1.0-pre-release.1") (source #f) (build-system gnu-build-system) (inputs `(,@(if (nix-system->native-chez-machine-type) @@ -329,8 +330,6 @@ will name the threaded machine type unless THREADS? is provided as #f." (ice-9 match) (srfi srfi-34)) #:out-of-source? #t - ;; Intermittent failures: https://github.com/cisco/ChezScheme/issues/809 - #:tests? #f #:test-target "test" ; test-one test-some-fast test-some test test-more #:configure-flags #~`(,@(let* ((chez+version (strip-store-file-name #$output)) @@ -509,6 +508,7 @@ version of Chez Scheme.") "1q66vafhiwk617z51qkm1v64r3bxqhhf5lzrmsa4l9d5yhvlyk09")) (file-name (git-file-name name version)) (patches (search-patches "chez-scheme-backport-configure.patch" + "chez-scheme-backport-signal.patch" "chez-scheme-bin-sh.patch")) (snippet #~(begin (use-modules (guix build utils)) diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index 1a95a5e6b5..25b9853439 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -60,8 +60,8 @@ #:use-module ((guix search-paths) #:select ($SSL_CERT_DIR))) (define-public cuirass - (let ((commit "2365ba786c805477fcbae6eaeb358b0dd0501598") - (revision "5")) + (let ((commit "ab5c751737b694b4d1e5fbbd7bc1ec559e94a7ce") + (revision "7")) (package (name "cuirass") (version (git-version "1.2.0" revision commit)) @@ -74,7 +74,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "1ffkn97b3nxfi2lhj7r2jli88xkhxazwn5fk2pyqchmls2ldpj5s")))) + "1cakc6q7gvd1qnfq47j6swqjrkgikwaq3ziwdrdvb0d23l2xzz29")))) (build-system gnu-build-system) (arguments (list #:modules `((guix build utils) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index ac025e0e3d..370b7714f1 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -2636,7 +2636,7 @@ file compression algorithm.") (define-public xarchiver (package (name "xarchiver") - (version "0.5.4.21") + (version "0.5.4.23") (source (origin (method git-fetch) @@ -2645,7 +2645,7 @@ file compression algorithm.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0m3vq1mh2vg5r7vhnwjkfhix6i2cm15z82xsi6zaqvc4zkswb2m5")))) + (base32 "0ccxp106c3r759l1bjaszz3fwlw10qzzlsd9mnmpksnlwfwjkmb8")))) (build-system glib-or-gtk-build-system) (native-inputs (list gettext-minimal intltool libxslt pkg-config)) diff --git a/gnu/packages/configuration-management.scm b/gnu/packages/configuration-management.scm index 818a80b94e..ffb6762142 100644 --- a/gnu/packages/configuration-management.scm +++ b/gnu/packages/configuration-management.scm @@ -24,6 +24,7 @@ #:use-module (guix git-download) #:use-module (gnu packages golang) #:use-module (gnu packages golang-build) + #:use-module (gnu packages golang-check) #:use-module (gnu packages golang-web) #:use-module (gnu packages golang-xyz) #:use-module (gnu packages version-control) @@ -48,7 +49,6 @@ (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/twpayne/chezmoi" #:install-source? #f #:phases @@ -80,51 +80,63 @@ "secretkeepassxc.txt" "secretlastpass.txt" "secretonepassword.txt" - "secretpass.txt"))))))) + "secretpass.txt")))) + ;; FIXME: Pattern embedded: cannot embed directory embedded: + ;; contains no embeddable files. + ;; + ;; This happens due to Golang can't determine the valid directory of + ;; the module which is sourced during setup environment phase, but + ;; easy resolved after coping to expected directory "vendor" within + ;; the current package, see details in Golang source: + ;; + ;; - URL: <https://github.com/golang/go/blob/> + ;; - commit: 82c14346d89ec0eeca114f9ca0e88516b2cda454 + ;; - file: src/cmd/go/internal/load/pkg.go#L2059 + (add-before 'build 'copy-input-to-vendor-directory + (lambda* (#:key import-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-path) + (mkdir "vendor") + (copy-recursively + (string-append + #$(this-package-native-input "go-github-com-charmbracelet-glamour") + "/src/github.com") + "vendor/github.com") + (copy-recursively + (string-append + #$(this-package-native-input "go-github-com-alecthomas-chroma-v2") + "/src/github.com") + "vendor/github.com")))) + (add-before 'install 'remove-vendor-directory + (lambda* (#:key import-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-path) + (delete-file-recursively "vendor"))))))) (native-inputs - (list go-github-com-alecthomas-chroma - go-github-com-aymerick-douceur + (list go-github-com-alecthomas-chroma-v2 go-github-com-bmatcuk-doublestar-v2 go-github-com-charmbracelet-glamour - go-github-com-chris-ramon-douceur go-github-com-coreos-go-semver - go-github-com-danwakefield-fnmatch - go-github-com-dlclark-regexp2 - go-github-com-godbus-dbus go-github-com-google-go-github-v33 - go-github-com-google-go-querystring - go-github-com-google-goterm go-github-com-google-renameio - go-github-com-gorilla-css - go-github-com-lucasb-eyer-go-colorful go-github-com-masterminds-sprig-v3 - go-github-com-mattn-go-isatty - go-github-com-mattn-go-runewidth - go-github-com-microcosm-cc-bluemonday - go-github-com-muesli-reflow-ansi - go-github-com-muesli-reflow-indent - go-github-com-muesli-reflow-padding - go-github-com-muesli-reflow-wordwrap - go-github-com-muesli-termenv - go-github-com-olekukonko-tablewriter go-github-com-pelletier-go-toml go-github-com-pkg-diff go-github-com-rogpeppe-go-internal go-github-com-sergi-go-diff go-github-com-spf13-cobra go-github-com-spf13-viper + go-github-com-stretchr-testify go-github-com-twpayne-go-shell go-github-com-twpayne-go-vfs go-github-com-twpayne-go-vfsafero - go-github-com-twpayne-go-xdg - go-github-com-yuin-goldmark + go-github-com-twpayne-go-xdg-v3 go-github-com-zalando-go-keyring go-github-go-git go-go-etcd-io-bbolt - go-golang-org-x-net go-golang-org-x-oauth2 + go-golang-org-x-sys go-golang-org-x-term - go-gopkg-in-errgo-fmt-errors)) + go-gopkg-in-yaml-v2 + go-howett-net-plist)) (home-page "https://www.chezmoi.io/") (synopsis "Personal configuration files manager") (description "This package helps to manage personal configuration files diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm index 72acfaba45..a80596aa53 100644 --- a/gnu/packages/containers.scm +++ b/gnu/packages/containers.scm @@ -160,7 +160,7 @@ runtime (like runc or crun) for a single container.") (define-public distrobox (package (name "distrobox") - (version "1.7.0") + (version "1.7.2.1") (source (origin (method git-fetch) @@ -168,12 +168,20 @@ runtime (like runc or crun) for a single container.") (url "https://github.com/89luca89/distrobox") (commit version))) (sha256 - (base32 "1g14q1sm3026h9n85v1gc3m2v9sgrac2mr9yrkh98qg5yahzmpc3")) + (base32 "0q0m3x1984kc5g7pihlwmnmrnnxnx6c0givx7wf91q91rlmdws0z")) (file-name (git-file-name name version)))) (build-system copy-build-system) (arguments (list #:phases #~(modify-phases %standard-phases + ;; This script creates desktop files but when the store path for + ;; distrobox changes it leaves the stale path on the desktop + ;; file, so remove the path to use the profile's current + ;; distrobox. + (add-after 'unpack 'patch-distrobox-generate-entry + (lambda _ + (substitute* "distrobox-generate-entry" + (("\\$\\{distrobox_path\\}/distrobox") "distrobox")))) ;; Use WRAP-SCRIPT to wrap all of the scripts of distrobox, ;; excluding the host side ones. (add-after 'install 'wrap-scripts @@ -456,7 +464,7 @@ Its main purpose is to support the key usage by @code{docker-init}: (define-public podman (package (name "podman") - (version "5.1.1") + (version "5.1.2") (source (origin (method git-fetch) @@ -464,7 +472,7 @@ Its main purpose is to support the key usage by @code{docker-init}: (url "https://github.com/containers/podman") (commit (string-append "v" version)))) (sha256 - (base32 "1rhlwd350ll472jn7gm4nbkfkbm609d5s97wdqfb7lfagqwi1vny")) + (base32 "1v0qqzfl0nqkqmqimv89nrggb7n1ryhqpdi8v7yn2c7m0dm8xq91")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 40181358ba..ee945fcc68 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -314,23 +314,21 @@ use by the C++ Core Guidelines maintained by the Standard C++ Foundation.") (name "c2ffi") ;; As per the c2ffi README: the first three elements are encoding the ;; required Clang/LLVM version, and the last one is the c2ffi revision. - (version "16.0.0.0") + (version "18.1.0.0") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/rpav/c2ffi") - ;; Upstream is not tagging releases consistently. - ;; (commit (string-append "v" version)) - (commit "097cbe61ca02dc79ea60859aa056975131a9d985"))) + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1mqhw4838chl495gaj9z0731ahkmqb4f3wlc1qalk82fdsaniyd5")) + (base32 "03hw650wjrc4jb4ra8bwc4rnprr0fpnf3wlxzacfjysvl25jb0j6")) (modules '((guix build utils))) (snippet '(substitute* "CMakeLists.txt" ;; Guix seems to be packaging LLVM libs separately thus -lLLVM - ;; won't work, every used library must be specified explicitly. + ;; won't work. Instead every library used must be listed. (("c2ffi PUBLIC clang-cpp LLVM") "c2ffi PUBLIC clang-cpp LLVMCore LLVMSupport LLVMMCParser \ LLVMOption LLVMBitReader LLVMProfileData"))))) @@ -346,9 +344,9 @@ LLVMOption LLVMBitReader LLVMProfileData"))))) (when tests? (invoke "./bin/c2ffi" "--help"))))))) (native-inputs - (list clang-16)) ; CMakeLists.txt invokes `clang -print-resource-dir` + (list clang-18)) ; CMakeLists.txt invokes `clang -print-resource-dir` (inputs - (list clang-16)) ; Compiled with gcc, but links against libclang-cpp.so + (list clang-18)) ; Compiled with gcc, but links against libclang-cpp.so (home-page "https://github.com/rpav/c2ffi") (synopsis "Clang-based FFI wrapper generator") (description diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 274432d194..32ee25e1ae 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -102,6 +102,7 @@ #:use-module (gnu packages protobuf) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages rust) #:use-module (gnu packages ssh) #:use-module (gnu packages sqlite) #:use-module (gnu packages statistics) @@ -332,14 +333,14 @@ multiple and joint correspondence analysis.") (define-public r-cachem (package (name "r-cachem") - (version "1.0.8") + (version "1.1.0") (source (origin (method url-fetch) (uri (cran-uri "cachem" version)) (sha256 (base32 - "1hj5gw040pdrl3iwvwbgyrs91jcar0pwr3kmf23wwpb1zqcsk77a")))) + "089f963h59z4n0sj3isjq2h7zw2485qw38jv8zdnbn755by3j22m")))) (properties `((upstream-name . "cachem"))) (build-system r-build-system) (propagated-inputs @@ -383,13 +384,13 @@ evaluation.") (define-public r-castor (package (name "r-castor") - (version "1.8.0") + (version "1.8.2") (source (origin (method url-fetch) (uri (cran-uri "castor" version)) (sha256 (base32 - "0caw206hndfzypj33w6npvppdc5hhq1q71wriqd0ck9f238rfi3c")))) + "1850i35qsxw7dkkblixnp4h5zhwg0ysx8rzns5h0kr9lwmil6biw")))) (properties `((upstream-name . "castor"))) (build-system r-build-system) (propagated-inputs (list r-jsonlite r-matrix r-naturalsort r-rcpp @@ -536,13 +537,13 @@ Shiny applications.") (define-public r-consort (package (name "r-consort") - (version "1.2.1") + (version "1.2.2") (source (origin (method url-fetch) (uri (cran-uri "consort" version)) (sha256 (base32 - "03xkypy4r84mdif6m331c27haxnyi1s87vvj2f83xxw0m0s5im5j")))) + "12gr1diyy2azy1fbh8z129lkm0ahwvm98j5hqxv93yp089a02l8c")))) (properties `((upstream-name . "consort"))) (build-system r-build-system) (native-inputs (list r-knitr)) @@ -559,13 +560,13 @@ labels on the node can also be achieved.") (define-public r-collapse (package (name "r-collapse") - (version "2.0.13") + (version "2.0.14") (source (origin (method url-fetch) (uri (cran-uri "collapse" version)) (sha256 - (base32 "11i1zw9c9fp5rnhd14b8ivqas38v8qywmmh9w4iaxrb02s77qwz5")))) + (base32 "0njmis9a0jc8xmdxgxhpydsj2ygb89hg402gpqaw1h5bcwwpf0m8")))) (properties `((upstream-name . "collapse"))) (build-system r-build-system) (propagated-inputs (list r-rcpp)) @@ -610,13 +611,13 @@ queues, stacks, deques, dicts and ordered dicts.") (define-public r-correlation (package (name "r-correlation") - (version "0.8.4") + (version "0.8.5") (source (origin (method url-fetch) (uri (cran-uri "correlation" version)) (sha256 (base32 - "07fz7wmvrcd6b023jhj3bsrvg4w6i7f1v99jslm0gj84vzmnqzbs")))) + "0b5vq7lvvwcv0sw54548ncn85nq6i78dpm44dfvrl23vg65pff0y")))) (properties `((upstream-name . "correlation"))) (build-system r-build-system) (propagated-inputs (list r-bayestestr r-datawizard r-insight r-parameters)) @@ -630,6 +631,26 @@ correlations, multilevel correlations, polychoric correlations, biweight correlations, distance correlations and more.") (license license:gpl3))) +(define-public r-countrycode + (package + (name "r-countrycode") + (version "1.6.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "countrycode" version)) + (sha256 + (base32 "1dix4prcavwbi7l7ifw1frvpmqqdcrvk4c45xl7ckg6068713nzr")))) + (properties `((upstream-name . "countrycode"))) + (build-system r-build-system) + (home-page "https://vincentarelbundock.github.io/countrycode/") + (synopsis "Convert country names and country codes") + (description + "This package lets you standardize country names, convert them into one +of 40 different coding schemes, convert between coding schemes, and assign +region descriptors.") + (license license:gpl3))) + (define-public r-cplm (package (name "r-cplm") @@ -741,14 +762,14 @@ functions are included.") (define-public r-datawizard (package (name "r-datawizard") - (version "0.10.0") + (version "0.11.0") (source (origin (method url-fetch) (uri (cran-uri "datawizard" version)) (sha256 (base32 - "0z3sds2mlmyd40xrjy6lcrym5sl1hcn2dxxfmljv2667vk9nrbmg")))) + "0cghk6flxxsz079sw8l4aw1h4girg7mwl61237a7ymmhvny70d4k")))) (properties `((upstream-name . "datawizard"))) (build-system r-build-system) (propagated-inputs @@ -766,16 +787,16 @@ wrangling backend for the packages in the @code{easystats} ecosystem.") (define-public r-dbscan (package (name "r-dbscan") - (version "1.1-12") + (version "1.2-0") (source (origin (method url-fetch) (uri (cran-uri "dbscan" version)) (sha256 - (base32 "1snfcf5jy3chh5nmvn7ashhlyv35nkajlfrlk9kzpy4jnfyv3y2n")))) + (base32 "0rv2h5i539ivkgwblfapjpfl09hgxvidkk6x1wmgc6hp30nbl2bj")))) (properties `((upstream-name . "dbscan"))) (build-system r-build-system) - (propagated-inputs (list r-rcpp)) + (propagated-inputs (list r-generics r-rcpp)) (native-inputs (list r-knitr)) (home-page "https://github.com/mhahsler/dbscan") (synopsis "Density-based spatial clustering of applications with noise") @@ -1273,13 +1294,13 @@ such as counts or binary matrices.") (define-public r-googlevis (package (name "r-googlevis") - (version "0.7.1") + (version "0.7.3") (source (origin (method url-fetch) (uri (cran-uri "googleVis" version)) (sha256 - (base32 "067jcwbq0a06wbpaa46ngjs3hkpvz8q6v8019f15yr58kq2k2n9k")))) + (base32 "0swcf2vl3mvp2bsd7nra917pajyh27j2k3vmmrb6n8g55mazyisn")))) (properties `((upstream-name . "googleVis"))) (build-system r-build-system) (propagated-inputs (list r-jsonlite)) @@ -1710,13 +1731,13 @@ datum to another.") (define-public r-rocit (package (name "r-rocit") - (version "2.1.1") + (version "2.1.2") (source (origin (method url-fetch) (uri (cran-uri "ROCit" version)) (sha256 - (base32 "0sd6ckh7k8aqwhzzp3qff6g7d03klbr0mbp403pib3823c8pqa55")))) + (base32 "17s7wi248vj6wbcxb6z0fdsw8bijjxva4sldlqcz4m73ccnrdikf")))) (properties `((upstream-name . "ROCit"))) (build-system r-build-system) (native-inputs (list r-knitr)) @@ -2235,13 +2256,13 @@ degree elevation and curve fitting.") (define-public r-biglm (package (name "r-biglm") - (version "0.9-2.1") + (version "0.9-3") (source (origin (method url-fetch) (uri (cran-uri "biglm" version)) (sha256 - (base32 "0iy9xr2bq42wlizgwlz7w5kh9206yqkw9h2cr6mcsmizgjg3rkvd")))) + (base32 "0n0dkazq74s3lml0ds9l38kzgapckjrvwyi62qb1y14cqlylhpc0")))) (properties `((upstream-name . "biglm"))) (build-system r-build-system) (propagated-inputs (list r-dbi)) @@ -2431,19 +2452,20 @@ size and can be easily tested locally before being sent to a remote.") (define-public r-climaemet (package (name "r-climaemet") - (version "1.2.1") + (version "1.3.0") (source (origin (method url-fetch) (uri (cran-uri "climaemet" version)) (sha256 (base32 - "1h3j8w6m568swa6qkfg107wvfdfg816p92y8ayss6acrrmrvax89")))) + "1ccf7639zk56m60cqd6z8h4s6nsvhv76d8ndbk832d9lak13b7wb")))) (properties `((upstream-name . "climaemet"))) (build-system r-build-system) (propagated-inputs - (list r-dplyr + (list r-cli + r-dplyr r-ggplot2 - r-httr + r-httr2 r-jsonlite r-rappdirs r-readr @@ -2580,13 +2602,13 @@ known as Dynamic Linear Models.") (define-public r-zcompositions (package (name "r-zcompositions") - (version "1.5.0-3") + (version "1.5.0-4") (source (origin (method url-fetch) (uri (cran-uri "zCompositions" version)) (sha256 (base32 - "1gbwx3vgx5viqnn5jsszild6ikyc2pmf1hdjc9475caf9xx9l589")))) + "1bvaw6m95hz8hd5p8h1d482b45r3w82dyj3sxlijf12s0qg8w63k")))) (properties `((upstream-name . "zCompositions"))) (build-system r-build-system) (propagated-inputs @@ -2731,14 +2753,14 @@ variables.") (define-public r-ggpp (package (name "r-ggpp") - (version "0.5.7") + (version "0.5.8-1") (source (origin (method url-fetch) (uri (cran-uri "ggpp" version)) (sha256 (base32 - "0gd8dbcja4qjwjh414mp2xf8hnjlrp4zm4ac8j59kqxzpwxv8n04")))) + "1jk3x679rvkj3if14cai99w5sk0nj07rhppwwd7i7a1daal0grh5")))) (properties `((upstream-name . "ggpp"))) (build-system r-build-system) (propagated-inputs @@ -2935,13 +2957,13 @@ axis} (SMA), and @dfn{ranged major axis} (RMA).") (define-public r-ggpmisc (package (name "r-ggpmisc") - (version "0.5.6") + (version "0.6.0") (source (origin (method url-fetch) (uri (cran-uri "ggpmisc" version)) (sha256 (base32 - "0w514js5q6xchbbw2x3085d7parwa8nqaj4fvjplhpfah6rya2dv")))) + "145w1pbwjdahgs06v8lms3ynpqryrrr4v0h8bgsmaqqkq1hjixmi")))) (build-system r-build-system) (propagated-inputs (list r-confintr @@ -3003,6 +3025,25 @@ axis, or summary graphics on a continuous axis such as a boxplot or a density distribution.") (license license:expat))) +(define-public r-gparotation + (package + (name "r-gparotation") + (version "2024.3-1") + (source + (origin + (method url-fetch) + (uri (cran-uri "GPArotation" version)) + (sha256 + (base32 "1njl4qg5jgmx14r41q1kzfmhf4zga3yjkig0h7ar35bq56pmgxl8")))) + (properties `((upstream-name . "GPArotation"))) + (build-system r-build-system) + (home-page "https://optimizer.r-forge.r-project.org/GPArotation_www/") + (synopsis "Gradient projection factor rotation") + (description + "This package provides gradient projection algorithms for factor +rotation. For details see @code{?GPArotation}.") + (license license:gpl2+))) + (define-public r-gprofiler (package (name "r-gprofiler") @@ -3218,13 +3259,13 @@ level p-values.") (define-public r-swagger (package (name "r-swagger") - (version "3.33.1") + (version "5.17.14.1") (source (origin (method url-fetch) (uri (cran-uri "swagger" version)) (sha256 (base32 - "1ldgmy5vjzd11z5yl5a518wkw6y0l469b2zf0lp12hk19jq6k0sj")))) + "0ykmz3j1n06w1injcnlkb3xv79vwiyv94j74m950rfrbv97dda58")))) (properties `((upstream-name . "swagger"))) (build-system r-build-system) (home-page "https://github.com/rstudio/swagger") @@ -3892,13 +3933,13 @@ high-dimensional data.") (define-public r-mc2d (package (name "r-mc2d") - (version "0.2.0") + (version "0.2.1") (source (origin (method url-fetch) (uri (cran-uri "mc2d" version)) (sha256 (base32 - "07h2gvmdfqjydikxksbqhikihg46fv6xyn8vk5kyni6x75gp9abk")))) + "06kva55vm2cldd95caw5hfx0xjadyhgkqi0y9pyz7hs3zg0zq9xy")))) (properties `((upstream-name . "mc2d"))) (build-system r-build-system) (propagated-inputs (list r-ggplot2 r-ggpubr r-mvtnorm)) @@ -4082,18 +4123,17 @@ Analysis Approach Using R. Chapman-Hall, 2019, (define-public r-vegan (package (name "r-vegan") - (version "2.6-4") + (version "2.6-6.1") (source (origin (method url-fetch) (uri (cran-uri "vegan" version)) (sha256 (base32 - "01hxlb5sy0d28ajq993fqs4z0qjcyl610d0ahjyjpbkrpszd92jx")))) + "0q0bp7xxmab1gcqk8wwm81sdvhccdvz5vqyn0grbwfb619q5wakx")))) (build-system r-build-system) (native-inputs - (list r-knitr ; needed for vignettes - gfortran)) + (list gfortran r-knitr)) (propagated-inputs (list r-cluster r-lattice r-mass r-mgcv r-permute)) (home-page "https://cran.r-project.org/web/packages/vegan") @@ -4108,23 +4148,23 @@ data types as well.") (define-public r-tglkmeans (package (name "r-tglkmeans") - (version "0.5.4") + (version "0.5.5") (source (origin (method url-fetch) (uri (cran-uri "tglkmeans" version)) (sha256 - (base32 "1plg03k9r4sp8ck5qcj8shblr8378bynyyc7yqwcqv856vkl9icd")))) + (base32 "0hdnxgkxpgb8jm9aygv3wlhd42blm5nz906vlpl72blgcyc77hhh")))) (properties `((upstream-name . "tglkmeans"))) (build-system r-build-system) (propagated-inputs (list r-cli r-dofuture + r-dorng r-dplyr r-future r-ggplot2 r-magrittr r-matrix - r-metacell r-plyr r-purrr r-rcpp @@ -4346,13 +4386,13 @@ scraping tasks, inspired by libraries like @code{BeautifulSoup}.") (define-public r-secretbase (package (name "r-secretbase") - (version "0.5.0") + (version "1.0.0") (source (origin (method url-fetch) (uri (cran-uri "secretbase" version)) (sha256 - (base32 "04xxjz4b9lpixgpa547rb9y2d370rs6jy1vyr6z24zkia1fmybg4")))) + (base32 "1lnmkppw6scgdd3qd45jfvnrxx5bsa4b37z212aq6ss7xxjlv8wh")))) (properties `((upstream-name . "secretbase"))) (build-system r-build-system) (home-page "https://shikokuchuo.net/secretbase/") @@ -4523,13 +4563,13 @@ that.") (define-public r-deming (package (name "r-deming") - (version "1.4") + (version "1.4-1") (source (origin (method url-fetch) (uri (cran-uri "deming" version)) (sha256 - (base32 "1yx3qrbik6jpqgsi0gqgc7y2cra13qlisg2gq8rvnv57nvcvb421")))) + (base32 "1jipary7wqb9gmj4mfrz4ym5ir44q2rhknxx6ah1f5lpkcsjm6c6")))) (properties `((upstream-name . "deming"))) (build-system r-build-system) (propagated-inputs (list r-boot)) @@ -4766,15 +4806,16 @@ sliding semi-landmarks and semi-automated surface landmark placement.") (define-public r-hgnchelper (package (name "r-hgnchelper") - (version "0.8.1") + (version "0.8.14") (source (origin (method url-fetch) (uri (cran-uri "HGNChelper" version)) (sha256 (base32 - "0qwkk5658j4j6w2wgvxkp38cyvscjp93d3zc7gb97vcihqx0ngxa")))) + "0rhqpzq6z57wzydwcz0ry61al68l3mll79s5hz8by7hy61izj5k5")))) (properties `((upstream-name . "HGNChelper"))) (build-system r-build-system) + (propagated-inputs (list r-splitstackshape)) (native-inputs (list r-knitr)) (home-page "https://github.com/waldronlab/HGNChelper") (synopsis @@ -5269,14 +5310,14 @@ speed increase from creating dummy variables through @code{model.matrix()}.") (define-public r-fastmap (package (name "r-fastmap") - (version "1.1.1") + (version "1.2.0") (source (origin (method url-fetch) (uri (cran-uri "fastmap" version)) (sha256 (base32 - "0wvibiy16i30nzg5k80md68lpz7g6iwbl02j4fyqmbhns2fq08rn")))) + "0ilj7gcbnha6l61sqzk6wrj6l08mxyay49957izha7axj6i09nmi")))) (properties `((upstream-name . "fastmap"))) (build-system r-build-system) (home-page "https://r-lib.github.io/fastmap/") @@ -5629,7 +5670,7 @@ previewing themes in real time.") (define-public r-shiny (package (name "r-shiny") - (version "1.8.0") + (version "1.8.1") (source (origin (method git-fetch) @@ -5639,7 +5680,7 @@ previewing themes in real time.") (file-name (git-file-name name version)) (sha256 (base32 - "0rfrch2147yhp2vkr3198gn1ww00ckzcw4i6rywfl38c6fdw9vr1")) + "06prh7r00dy1i2nlcls9cpfiw86lbyzbgcf9hbj54j6kfv8mh5fw")) (snippet '(for-each delete-file '("inst/www/shared/bootstrap/js/bootstrap.min.js" @@ -6514,6 +6555,26 @@ named elements: the @code{status}, the @code{headers}, and the @code{body}.") work well on small screens.") (license license:gpl3))) +(define-public r-minty + (package + (name "r-minty") + (version "0.0.1") + (source + (origin + (method url-fetch) + (uri (cran-uri "minty" version)) + (sha256 + (base32 "1kbs4f36s5bnjpc5wcqawbk154n9wjpf549hsjj4xdcg7ihcdgfg")))) + (properties `((upstream-name . "minty"))) + (build-system r-build-system) + (propagated-inputs (list r-cpp11 r-tzdb)) + (home-page "https://gesistsa.github.io/minty/") + (synopsis "Minimal type guesser") + (description + "This is a port of the type guesser from the @code{readr} package, the +so-called readr first edition parsing engine, now superseded by vroom.") + (license license:expat))) + (define-public r-feather (package (name "r-feather") @@ -7132,22 +7193,23 @@ is configured appropriately so R can use them.") (define-public r-pkgload (package (name "r-pkgload") - (version "1.3.4") + (version "1.4.0") (source (origin (method url-fetch) (uri (cran-uri "pkgload" version)) (sha256 (base32 - "1ki6k7l7dpb6bncvvcndrv5764jb1adrzs5iaxicakfsija4pc30")))) + "0jbmlvii40q6ymdhislmgby6dpf9585xl9d5cf8g4nn2kig8ir09")))) (build-system r-build-system) (propagated-inputs (list r-cli - r-crayon r-desc r-fs r-glue + r-lifecycle r-pkgbuild + r-processx r-rlang r-rprojroot r-withr)) @@ -7162,13 +7224,13 @@ you to rapidly iterate while developing a package.") (define-public r-pki (package (name "r-pki") - (version "0.1-12") + (version "0.1-14") (source (origin (method url-fetch) (uri (cran-uri "PKI" version)) (sha256 - (base32 "0nidg6l9nrmpyimi502fydy22r247w9i4ngb2xdbxjvfhr17m0xd")))) + (base32 "0rkr3gf5aqkrxi134kwggsyj151nwcwndy8d8q2vfy5rfwcyh960")))) (properties `((upstream-name . "PKI"))) (build-system r-build-system) (inputs (list openssl zlib)) @@ -7582,17 +7644,18 @@ graphics packages that comes with the base installation.") (define-public r-ctrdata (package (name "r-ctrdata") - (version "1.17.2") + (version "1.19.0") (source (origin (method url-fetch) (uri (cran-uri "ctrdata" version)) (sha256 (base32 - "0xsi3yc08gg9h5zh9h9r2d2ixv36f6wblmkcv51h9nfmawjyd8f8")))) + "00wp5jf2sa4l28ffl109r87xvjm8c5i7nl09azypnml6rf0mqrhr")))) (properties `((upstream-name . "ctrdata"))) (build-system r-build-system) (propagated-inputs (list r-clipr + r-countrycode r-curl r-digest r-dplyr @@ -7971,13 +8034,13 @@ way.") (define-public r-restrserve (package (name "r-restrserve") - (version "1.2.2") + (version "1.2.3") (source (origin (method url-fetch) (uri (cran-uri "RestRserve" version)) (sha256 - (base32 "0jbzalk17jg4qm99005q69pyk76c0wjvdwzjp25npzcvlbsxa194")))) + (base32 "0d5ppgasaqpgvdi1spxlhp4ywpafbphlhkqfcfvgxrdm6y9igl2c")))) (build-system r-build-system) (propagated-inputs (list r-checkmate @@ -8145,13 +8208,13 @@ do-it-yourself toolkit allows users to define their own Lambert W x (define-public r-lamw (package (name "r-lamw") - (version "2.2.3") + (version "2.2.4") (source (origin (method url-fetch) (uri (cran-uri "lamW" version)) (sha256 (base32 - "0jq3xq2ll4lpj8f5aqwazqlb978nzyk7hln4iwlzrlkkcqc35qm1")))) + "1h1plx9d6kzgdv20sx7pjfkz54jw11pkqrspgw4hh1kgk6hpbgsz")))) (properties `((upstream-name . "lamW"))) (build-system r-build-system) (propagated-inputs (list r-rcpp r-rcppparallel)) @@ -8261,13 +8324,13 @@ provides an interactive R manager and worker environment.") (define-public r-rmumps (package (name "r-rmumps") - (version "5.2.1-29") + (version "5.2.1-30") (source (origin (method url-fetch) (uri (cran-uri "rmumps" version)) (sha256 - (base32 "1sxx5kyp331dmiyqd4l5m3mdcmlpm1vbdm6cd3kgvnz8ympphlwr")))) + (base32 "0mz6dmb16dd8pflyd29ikj0wjlfbp4ri3xvc3fgmh26v1mvvaic4")))) (properties `((upstream-name . "rmumps") (updater-extra-inputs . ("zlib")))) @@ -9018,17 +9081,18 @@ contexts.") (define-public r-cvxr (package (name "r-cvxr") - (version "1.0-12") + (version "1.0-14") (source (origin (method url-fetch) (uri (cran-uri "CVXR" version)) (sha256 (base32 - "1igzi231rkqi7pc5ak8b29a8x7fry0yqs8vg2m4i5ab9jdm8fsp7")))) + "1nvwym5fwkyqkw8dpar571kr5695w7yrih6w9vnhswikp717q0jd")))) (properties `((upstream-name . "CVXR"))) (build-system r-build-system) (propagated-inputs (list r-bit64 + r-clarabel r-ecosolver r-gmp r-matrix @@ -9177,14 +9241,14 @@ regression using Kernel Ridge Regression.") (define-public r-prodlim (package (name "r-prodlim") - (version "2023.08.28") + (version "2024.06.25") (source (origin (method url-fetch) (uri (cran-uri "prodlim" version)) (sha256 (base32 - "1s2xalxfq2q6a9ssz01vzpldpa98q3cl5icap0k2xr5v72gj40l0")))) + "0r3780j04wy3ihrhvfm3qcwa9xjrxl43bcllzzq7xaki85jiz5j6")))) (build-system r-build-system) (propagated-inputs (list r-data-table @@ -9399,17 +9463,17 @@ to access PostgreSQL database systems.") (define-public r-rpostgres (package (name "r-rpostgres") - (version "1.4.6") + (version "1.4.7") (source (origin (method url-fetch) (uri (cran-uri "RPostgres" version)) (sha256 (base32 - "1ld03r9rzfxx6gzy3yn8jhzp9sp2qd9wydpxz955ggjxwdklpvnr")))) + "0939ysl9m35aknnh3xk92xxymk1g0xqnjb2khq55m8nq7gcg3l9x")))) (properties `((upstream-name . "RPostgres"))) (build-system r-build-system) - (inputs (list postgresql)) + (inputs (list openssl postgresql)) (propagated-inputs (list r-bit64 r-blob @@ -9587,17 +9651,17 @@ problems as well as resampling based estimators of prediction error.") (define-public r-psych (package (name "r-psych") - (version "2.4.3") + (version "2.4.6.26") (source (origin (method url-fetch) (uri (cran-uri "psych" version)) (sha256 (base32 - "0ic479y314knn20m1cjlp15lji7f70xrg95ln570pgkhrk5853bi")))) + "1gnjpcpqlviyyj5myhy440fj1zwx14b9jwhp5907yyhhw2ail69d")))) (build-system r-build-system) (propagated-inputs - (list r-lattice r-mnormt r-nlme)) + (list r-gparotation r-lattice r-mnormt r-nlme)) (native-inputs (list r-knitr)) (home-page "https://cran.r-project.org/web/packages/psych/") @@ -9640,19 +9704,18 @@ by base R methods related to model fitting.") (define-public r-broom (package (name "r-broom") - (version "1.0.5") + (version "1.0.6") (source (origin (method url-fetch) (uri (cran-uri "broom" version)) (sha256 (base32 - "14fr17cvpy6jzdffzrf46xah70xcq2nkbjyxmkyzwbz3kvpdsxwx")))) + "1kxwkyhm4m586v2kp15r4q2zsarnkrkzmgl17n6y7ggzilj3dkr4")))) (build-system r-build-system) (propagated-inputs (list r-backports r-dplyr - r-ellipsis r-generics r-glue r-lifecycle @@ -9842,6 +9905,29 @@ functions of a stable variate, as well as generalized regression models for the parameters of a stable distribution.") (license license:gpl2+))) +(define-public r-stabm + (package + (name "r-stabm") + (version "1.2.2") + (source + (origin + (method url-fetch) + (uri (cran-uri "stabm" version)) + (sha256 + (base32 "1vslidq2pzpwhsrsklghaqsdjjf4w4wqs2dng0p68zhrv5vlivhq")))) + (properties `((upstream-name . "stabm"))) + (build-system r-build-system) + (propagated-inputs (list r-checkmate r-matrix)) + (native-inputs (list r-knitr)) + (home-page "https://bommert.github.io/stabm/") + (synopsis "Stability measures for feature selection") + (description + "This package provides an implementation of many measures for the +assessment of the stability of feature selection. Both simple measures and +measures which take into account the similarities between features are +available.") + (license license:lgpl3))) + (define-public r-statip (package (name "r-statip") @@ -9989,14 +10075,14 @@ of the text. All return names of the encodings are iconv-compatible.") (define-public r-ucminf (package (name "r-ucminf") - (version "1.2.1") + (version "1.2.2") (source (origin (method url-fetch) (uri (cran-uri "ucminf" version)) (sha256 (base32 - "10ycpzxx73div9vpzmkhy524yd47kzmpl7ajpm248clsv6ivngpd")))) + "0adxynpi6mn5n37i1260yr6z7dm39dadr4nwrxks2jgsd7knmnsb")))) (build-system r-build-system) (native-inputs (list gfortran)) (home-page "https://cran.r-project.org/web/packages/ucminf/") @@ -10505,14 +10591,14 @@ training models for classification or ranking.") (define-public r-xts (package (name "r-xts") - (version "0.13.2") + (version "0.14.0") (source (origin (method url-fetch) (uri (cran-uri "xts" version)) (sha256 (base32 - "1yqx1x395hvdav1fvmpwrfm8sir398ky1bi0x5zsm7acbkv91maa")) + "1nfgbwzibzjni2p8ssvrsyhf75y1g53j1z6kp8ashxlqzbp1d2yj")) (modules '((guix build utils))) (snippet '(with-directory-excursion "inst/doc" @@ -10649,13 +10735,13 @@ VCF data and familiar R software.") (define-public r-rvcg (package (name "r-rvcg") - (version "0.22.2") + (version "0.23") (source (origin (method url-fetch) (uri (cran-uri "Rvcg" version)) (sha256 (base32 - "077p4c16nqi6ayxv1i31cr6sw9fwnxpmfkmrrhzh02khpi2c2jg5")))) + "0jdhl769r99g0x9kaf1cymzjd96z2pdnha7wyy221q3w3iy81whz")))) (properties `((upstream-name . "Rvcg"))) (build-system r-build-system) (propagated-inputs (list r-rcpp r-rcpparmadillo r-rcppeigen)) @@ -10843,14 +10929,14 @@ multivariate function estimation using smoothing splines.") (define-public r-cli (package (name "r-cli") - (version "3.6.2") + (version "3.6.3") (source (origin (method url-fetch) (uri (cran-uri "cli" version)) (sha256 (base32 - "0lg131q9l8wpnggc3jlrjl1ri3dw0d1pi4nr1zlnlaqvf7ilj1sc")))) + "0ha8mijnzlz1cxsjk502j2gzspd8fnk3j79bvnqm871225ghi5a2")))) (build-system r-build-system) (home-page "https://github.com/r-lib/cli#readme") (synopsis "Helpers for developing command line interfaces") @@ -11153,13 +11239,13 @@ iVAT).") (define-public r-xfun (package (name "r-xfun") - (version "0.43") + (version "0.45") (source (origin (method url-fetch) (uri (cran-uri "xfun" version)) (sha256 - (base32 "1hqn9r4xk0jjm1kafn7r8jbpciqciw8gh1vqch0wlvzda8m4dbar")))) + (base32 "049nk6h9xbdn2i6m07s26rqn790adww2y6mya03v95yj5xfg05iq")))) (build-system r-build-system) (properties ;; knitr itself depends on xfun @@ -11907,14 +11993,14 @@ documents.") (define-public r-leaps (package (name "r-leaps") - (version "3.1") + (version "3.2") (source (origin (method url-fetch) (uri (cran-uri "leaps" version)) (sha256 (base32 - "1dn3yl1p03n0iynd1vsdkrr0fhmvgrmfkv37y7n371765h83lz1x")))) + "1bbgm6l12gj1y28ks21awxphpmp07hb0ffiyrw7dqp3fcyxvxmm0")))) (build-system r-build-system) (native-inputs (list gfortran)) (home-page "https://cran.r-project.org/web/packages/leaps/") @@ -12050,14 +12136,14 @@ financial trading strategies.") (define-public r-tseries (package (name "r-tseries") - (version "0.10-55") + (version "0.10-56") (source (origin (method url-fetch) (uri (cran-uri "tseries" version)) (sha256 (base32 - "03jb2ij4jyhrbygi0gha549vq262kx1ffjmy12rf0gak0qmq5iwp")))) + "1s7sz95j6mm4708s3hffrnfkmdjgj43gba07wr6v24fg9xygq7m8")))) (build-system r-build-system) (propagated-inputs (list r-jsonlite r-quadprog r-quantmod r-zoo)) @@ -12198,16 +12284,16 @@ chaotic time series analysis.") (define-public r-fresh (package (name "r-fresh") - (version "0.2.0") + (version "0.2.1") (source (origin (method url-fetch) (uri (cran-uri "fresh" version)) (sha256 (base32 - "1787mm6w2s5x9scxy7r9cb77rgpmy4ngwkn4z8g3gs48mrab4bd9")))) + "19ki4hxlqzshdmy981gcvbn8wxqa893p5rs55l0q7iipkcmhf9jq")))) (properties `((upstream-name . "fresh"))) (build-system r-build-system) - (propagated-inputs (list r-htmltools r-rstudioapi r-sass r-shiny)) + (propagated-inputs (list r-bslib r-htmltools r-rstudioapi r-sass r-shiny)) (native-inputs (list r-knitr)) (home-page "https://github.com/dreamRs/fresh") (synopsis "Create custom Bootstrap themes to use in Shiny") @@ -12220,14 +12306,14 @@ flexdashboard.") (define-public r-urca (package (name "r-urca") - (version "1.3-3") + (version "1.3-4") (source (origin (method url-fetch) (uri (cran-uri "urca" version)) (sha256 (base32 - "1wg9f691pif59xds43gnnw77mmzc9xpnhhvaksk2b0szffvaifj3")))) + "05nb1an5a8r0w6gca6cf40nws2v4hxhznz8kyfm7q7hz0kjnqggy")))) (build-system r-build-system) (propagated-inputs (list r-nlme)) (native-inputs (list gfortran)) @@ -12839,14 +12925,14 @@ local smoothers and many more.") (define-public r-radiant-data (package (name "r-radiant-data") - (version "1.6.3") + (version "1.6.6") (source (origin (method url-fetch) (uri (cran-uri "radiant.data" version)) (sha256 (base32 - "1nwiw5dps0030f893gs0fixis6xigfr8y8rqhi3l505yx2bsrjbj")) + "09cbd21bvj4a3n5r1ch638y5dgi7xmmg1y62i6ixcjhbr8wypjmn")) (modules '((guix build utils))) (snippet '(delete-file "inst/assets/html2canvas/html2canvas.min.js")))) @@ -12967,14 +13053,14 @@ plots) for multivariate and time series-like data.") (define-public r-signal (package (name "r-signal") - (version "1.8-0") + (version "1.8-1") (source (origin (method url-fetch) (uri (cran-uri "signal" version)) (sha256 (base32 - "1126p631zm0wc4h9ghqai5yb9vklpz676fygb0d0aavs2raaijw9")))) + "1c7fw5akdm8f44zgdafsgz2fpn6kfwifaw29yakl7zykq89vq8m3")))) (build-system r-build-system) (propagated-inputs (list r-mass)) (native-inputs (list gfortran)) @@ -13600,14 +13686,14 @@ dependency on Java.") (define-public r-rio (package (name "r-rio") - (version "1.0.1") + (version "1.1.1") (source (origin (method url-fetch) (uri (cran-uri "rio" version)) (sha256 (base32 - "1vkvajlmp8kgmkadamy0xm885whfkwacq2jxcrshz1w8amy16k3m")))) + "0llvdd4vdxpvjvbya3b6kh04h0k48ijy4dkjl77ynvhlh9wyzw9y")))) (build-system r-build-system) (propagated-inputs (list r-curl @@ -13616,8 +13702,8 @@ dependency on Java.") r-haven r-lifecycle r-r-utils + r-readr r-readxl - r-stringi r-tibble r-writexl)) (native-inputs @@ -13878,14 +13964,14 @@ it.") (define-public r-rgexf (package (name "r-rgexf") - (version "0.16.2") + (version "0.16.3") (source (origin (method url-fetch) (uri (cran-uri "rgexf" version)) (sha256 (base32 - "00c2zka1n3k7p1l0mlchr063s6x58p9r3fb64d4wgl4rvsq55q3f")) + "1c1rqgr7qsj61gp2frm197k396xfdspvmmwr56izwb09225cbp6d")) ;; Delete minified JavaScript files (snippet '(for-each delete-file @@ -14075,13 +14161,13 @@ the source data frame.") (define-public r-rapiclient (package (name "r-rapiclient") - (version "0.1.4") + (version "0.1.5") (source (origin (method url-fetch) (uri (cran-uri "rapiclient" version)) (sha256 (base32 - "0k92557f90mrmsbfsyvjv377qi04zdh6lqhgnqx51z95f5198kd8")))) + "1xp6mmk2rrlk0wmvv23k1dgr7pydw46iinvd138167frmr0rdica")))) (properties `((upstream-name . "rapiclient"))) (build-system r-build-system) (propagated-inputs @@ -14297,14 +14383,14 @@ always locate the files relative to your project root.") (define-public r-reticulate (package (name "r-reticulate") - (version "1.36.1") + (version "1.38.0") (source (origin (method url-fetch) (uri (cran-uri "reticulate" version)) (sha256 (base32 - "0c6x6fm8pqw4dj5x2xn12l01piaday0fv588hx903mw3lks3fzbw")))) + "13favs31kzzff7ii0fxsdwvwb3iijasn2mg57ghcv8si4cz32byb")))) (build-system r-build-system) (arguments (list @@ -14443,14 +14529,14 @@ Sequence logos can easily be combined with other ggplot2 plots.") (define-public r-ggsci (package (name "r-ggsci") - (version "3.0.3") + (version "3.2.0") (source (origin (method url-fetch) (uri (cran-uri "ggsci" version)) (sha256 (base32 - "1m806aqp97pp57i6dl5ykmfhd4lvd1gpamzghks8fx1nksh935mx")))) + "0jiwkk2ij1qnsaqr6354wihj057ia1arrfpjpll00x63056fvn21")))) (build-system r-build-system) (propagated-inputs (list r-ggplot2 r-scales)) @@ -14886,14 +14972,14 @@ run basic analyses on pupillometry experiments.") (define-public r-gbrd (package (name "r-gbrd") - (version "0.4-11") + (version "0.4.12") (source (origin (method url-fetch) (uri (cran-uri "gbRd" version)) (sha256 (base32 - "06x97rw5i6v6cgjxkfhxnw4dn7lghn5q6ra7ri5ag1x9dkfzcl82")))) + "0f13hg6nckl4aflwd49g4x2adxjfgah2yga70z1m8jszhhm1vka8")))) (properties `((upstream-name . "gbRd"))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/gbRd/") @@ -15176,14 +15262,14 @@ parse and convert strings into cases like snake or camel among others.") (define-public r-prediction (package (name "r-prediction") - (version "0.3.17") + (version "0.3.18") (source (origin (method url-fetch) (uri (cran-uri "prediction" version)) (sha256 (base32 - "09fwg3cv7s5mzlcnwp4a04h0ps9m5qlb533p1cpqlinwl72lj4dq")))) + "194p2zbypslkd7slnvqw2z456xxwfzjxd11dirhpffjcsizkgrnh")))) (build-system r-build-system) (propagated-inputs (list r-data-table)) @@ -15220,14 +15306,14 @@ Decomposition in R (Beaton et al 2014) <doi:10.1016/j.csda.2013.11.006>.") (define-public r-insight (package (name "r-insight") - (version "0.19.11") + (version "0.20.1") (source (origin (method url-fetch) (uri (cran-uri "insight" version)) (sha256 (base32 - "0za6f3bvkybd84jyazg1n03lhzl1w3mpca5c0qsygkgbbyhiddbj")))) + "19lg5dipnwlfxzcpq2mj348f8pnzn6i7sj77hf5ppzha370acgy2")))) (build-system r-build-system) (native-inputs (list r-knitr)) @@ -15274,17 +15360,18 @@ vice versa), or to deal with multiple declared missing values.") (define-public r-sjmisc (package (name "r-sjmisc") - (version "2.8.9") + (version "2.8.10") (source (origin (method url-fetch) (uri (cran-uri "sjmisc" version)) (sha256 (base32 - "1gzkq95ckxr0vhrzggflzli9hs7zr8c0yym9zn1wf74yrr0mgc3q")))) + "12y5aa820h95dbak9zd2rbg1hc0636b2dpg0mn9mkb76a4ssnr1d")))) (build-system r-build-system) (propagated-inputs - (list r-dplyr + (list r-datawizard + r-dplyr r-insight r-magrittr r-purrr @@ -15306,13 +15393,13 @@ tidyverse workflow.") (define-public r-nodbi (package (name "r-nodbi") - (version "0.10.4") + (version "0.10.5") (source (origin (method url-fetch) (uri (cran-uri "nodbi" version)) (sha256 (base32 - "0q4nsxic1jlraipdc6zi711c3316n9wgq1cgbywhjlxb52qhkmd7")))) + "0cbwzclym2r28d1m662sg6krkpczsmpzigjzp3fhkkd7j7i1w9yi")))) (properties `((upstream-name . "nodbi"))) (build-system r-build-system) (propagated-inputs @@ -15441,13 +15528,13 @@ libxlsxwriter.") (define-public r-writexls (package (name "r-writexls") - (version "6.5.0") + (version "6.6.0") (source (origin (method url-fetch) (uri (cran-uri "WriteXLS" version)) (sha256 (base32 - "1rkc0r6l7cfz7h83i7gw6g0nlyy347mdh6bj73j0f8mdv3nmwwn4")))) + "0adpwd80hhw6i965wp1w74s85vzq2gv5pf98zcvjwaqvpkrs25xw")))) (properties `((upstream-name . "WriteXLS"))) (build-system r-build-system) (inputs (list perl)) @@ -15488,14 +15575,14 @@ location measures.") (define-public r-biasedurn (package (name "r-biasedurn") - (version "2.0.11") + (version "2.0.12") (source (origin (method url-fetch) (uri (cran-uri "BiasedUrn" version)) (sha256 (base32 - "0dvmkrdmhfh4swilyxf10y856kx0zf9sj1gc0g62bm6r5jhz35b2")))) + "14jpijms81pgl4zyqrhwwdfj0jmlmml21blspvin8lqw8fbbbcr9")))) (properties `((upstream-name . "BiasedUrn"))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/BiasedUrn/") @@ -15706,14 +15793,14 @@ the work.") (define-public r-doby (package (name "r-doby") - (version "4.6.21") + (version "4.6.22") (source (origin (method url-fetch) (uri (cran-uri "doBy" version)) (sha256 (base32 - "01s9kls9j1nvygh0cc2bfd6n5sjccaalvfw3zx8sv7r2p4clgsij")))) + "038b1gs039br4xzv6axij2fzdzahmk718qm4akg77bwqvqvf59ra")))) (properties `((upstream-name . "doBy"))) (build-system r-build-system) (propagated-inputs @@ -15727,7 +15814,6 @@ the work.") r-matrix r-microbenchmark r-modelr - r-pbkrtest r-rlang r-tibble r-tidyr)) @@ -17322,14 +17408,14 @@ analysis.") (define-public r-gee (package (name "r-gee") - (version "4.13-26") + (version "4.13-27") (source (origin (method url-fetch) (uri (cran-uri "gee" version)) (sha256 (base32 - "1323qv2hiinixmwcb8rfvf5qmkffnnq9f1g8kj9amwsimfsm71cs")))) + "1754173msjxhkpl95v6z8c73vhz7ivfil0xfs25smrlgslzpgd1z")))) (properties `((upstream-name . "gee"))) (build-system r-build-system) (native-inputs @@ -17404,13 +17490,13 @@ were influenced by the drake R package by Will Landau (2018) (define-public r-targets (package (name "r-targets") - (version "1.7.0") + (version "1.7.1") (source (origin (method url-fetch) (uri (cran-uri "targets" version)) (sha256 (base32 - "1h939mvyxd1wjakcbxjxcmn6a7i23ya1kc89aqwarizsj00hdjil")))) + "1r4pg990nhmyg4i15qgqafvqas4vh5rvcki3iaff2hyrfdcmy6vy")))) (properties `((upstream-name . "targets"))) (build-system r-build-system) (propagated-inputs (list r-base64url @@ -17581,16 +17667,16 @@ estimation problem.") (define-public r-quickjsr (package (name "r-quickjsr") - (version "1.1.3") + (version "1.2.2") (source (origin (method url-fetch) (uri (cran-uri "QuickJSR" version)) (sha256 (base32 - "0ccp7dx2jhlarfn48jc0mhci5kkj0r3ibh6rjnxswvp3yg2x2bgd")))) + "1vb8b591imq737zin77sh3icld87pqk5mssmn7ddzj45cn22z12i")))) (properties `((upstream-name . "QuickJSR"))) (build-system r-build-system) - (propagated-inputs (list r-jsonlite r-r6 r-rcpp)) + (native-inputs (list r-knitr)) (home-page "https://cran.r-project.org/package=QuickJSR") (synopsis "Interface for the QuickJS lightweight JavaScript engine") (description @@ -17848,14 +17934,14 @@ the differences were not significantly different.") (define-public r-emmeans (package (name "r-emmeans") - (version "1.10.1") + (version "1.10.3") (source (origin (method url-fetch) (uri (cran-uri "emmeans" version)) (sha256 (base32 - "175az87aj2zrjsi94vvca612krbhry7yqq6l03ybq31jhj7vc2fa")))) + "01c2d0kb36lrff5l49kyfl2j3byzblmhw2jkz215hhl8jmyk0akv")))) (build-system r-build-system) (propagated-inputs (list r-estimability r-mvtnorm r-numderiv)) @@ -17985,14 +18071,14 @@ Bayesian modeling.") (define-public r-tmb (package (name "r-tmb") - (version "1.9.11") + (version "1.9.13") (source (origin (method url-fetch) (uri (cran-uri "TMB" version)) (sha256 (base32 - "07z9565rn64k3ysvcgq6s792qg1v102gd9in5ifigm140zc4l45j")))) + "0yr9xnl57cgw1q210iip5fxbgqd6pswiw0kgwf23v3glkadqq4gb")))) (properties `((upstream-name . "TMB"))) (build-system r-build-system) (propagated-inputs @@ -18012,33 +18098,16 @@ detection, parallelism through BLAS and parallel user templates.") (define-public r-sjstats (package (name "r-sjstats") - (version "0.18.2") + (version "0.19.0") (source (origin (method url-fetch) (uri (cran-uri "sjstats" version)) (sha256 - (base32 "0a1y6bqyvgs0avzasr8g6vwcxcnj4d9g0rfz2qiznwadpjzqw66h")))) + (base32 "07qv32gnrhrl21zgj1xp1gqdqjn6ax1nf40s11nmpag8r0xgvqnk")))) (build-system r-build-system) (propagated-inputs - (list r-bayestestr - r-broom - r-datawizard - r-dplyr - r-effectsize - r-emmeans - r-insight - r-lme4 - r-magrittr - r-mass - r-modelr - r-parameters - r-performance - r-purrr - r-rlang - r-sjlabelled - r-sjmisc - r-tidyr)) + (list r-datawizard r-effectsize r-insight r-parameters r-performance)) (home-page "https://github.com/strengejacke/sjstats") (synopsis "Functions for common statistical computations") (description @@ -18117,14 +18186,14 @@ ROPE percentage and pd).") (define-public r-performance (package (name "r-performance") - (version "0.11.0") + (version "0.12.0") (source (origin (method url-fetch) (uri (cran-uri "performance" version)) (sha256 (base32 - "03zs162lah8yv2x2q829ifc3jwy7m89r6md4ildjz8qmfjf0js82")))) + "0py6b1mix26z7fmarya7gfa9bwb8ymsr7z78ag8kld6ih3slga7z")))) (build-system r-build-system) (propagated-inputs (list r-bayestestr r-datawizard r-insight)) @@ -18143,14 +18212,14 @@ effects models and Bayesian models.") (define-public r-ggeffects (package (name "r-ggeffects") - (version "1.5.2") + (version "1.7.0") (source (origin (method url-fetch) (uri (cran-uri "ggeffects" version)) (sha256 (base32 - "1f5ralb5fkcv2rflsl0y9lgwdmx6zzv3s1087lql9x5vjd1hkvcg")))) + "1pbg6iwnbh7cwdzhb44knnbv70lkcgjzrzwyhdzv28vmyc7qy9cj")))) (build-system r-build-system) (propagated-inputs (list r-insight)) @@ -18217,13 +18286,13 @@ efficient computation even with very large data sets.") (define-public r-sjplot (package (name "r-sjplot") - (version "2.8.15") + (version "2.8.16") (source (origin (method url-fetch) (uri (cran-uri "sjPlot" version)) (sha256 - (base32 "10lvn8dnckpjjpapmf0d2zwjkzjvs4iiswd3rmijzviz4ichhxjs")))) + (base32 "093nmn1gq8i4kr5nhwby883rxpdiyb959shqvfnvplwcnnv762ji")))) (properties `((upstream-name . "sjPlot"))) (build-system r-build-system) (propagated-inputs @@ -20023,17 +20092,17 @@ can be made by using glyphs.") (define-public r-waveslim (package (name "r-waveslim") - (version "1.8.4") + (version "1.8.5") (source (origin (method url-fetch) (uri (cran-uri "waveslim" version)) (sha256 (base32 - "1510xpkgrhdw394m5anxccdczjikcxazyd09ix2z73i15akyx3j0")))) + "0xd7006skrsvkwj4pkxqbfsbs58rfcpfcfk1lf0gsd2y0wisi60y")))) (build-system r-build-system) - (native-inputs - (list gfortran)) + (propagated-inputs + (list r-multitaper)) (home-page "http://waveslim.blogspot.com") (synopsis "Basic wavelet routines for signal processing") (description @@ -20338,13 +20407,13 @@ while other are highly specific for the special data format used for (define-public r-qmri (package (name "r-qmri") - (version "1.2.7") + (version "1.2.7.6") (source (origin (method url-fetch) (uri (cran-uri "qMRI" version)) (sha256 (base32 - "0jiwvnhmm4zwqydqkzsygwkm23nc0zzjz5w7yckwdfc5zafch4hk")))) + "0mbxgg80p159vkz05hbzvvip7h5y5rpvjrjnq1vivz855dk0053g")))) (properties `((upstream-name . "qMRI"))) (build-system r-build-system) (propagated-inputs (list r-adimpro r-aws r-awsmethods r-oro-nifti @@ -20701,14 +20770,14 @@ and compatibility with @code{ape} objects.") (define-public r-rnifti (package (name "r-rnifti") - (version "1.6.1") + (version "1.7.0") (source (origin (method url-fetch) (uri (cran-uri "RNifti" version)) (sha256 (base32 - "0wn06fnq5c7f0vwakryb75vzkjh03dqz2z57lgmn68hwgssnpalc")))) + "1s0q1vs6hzg1xadk43rxqxi55swkl7pgsnw45im5vgsz1wxgg375")))) (properties `((upstream-name . "RNifti"))) (build-system r-build-system) (inputs (list zlib)) @@ -20812,13 +20881,13 @@ handling.") (define-public r-gridpattern (package (name "r-gridpattern") - (version "1.2.1") + (version "1.2.2") (source (origin (method url-fetch) (uri (cran-uri "gridpattern" version)) (sha256 - (base32 "0rkhwk3h5rd3z52dnjc5rq1gbay17r208zfqbkh9gj9kn8rb2wb8")))) + (base32 "1fa787m4ns3s7xnai1kqplz32nhy4pa1v6w7kzyjv9qlyfhvrw92")))) (properties `((upstream-name . "gridpattern"))) (build-system r-build-system) (propagated-inputs @@ -21767,13 +21836,13 @@ Differences with other sparse matrix packages are: (define-public r-fields (package (name "r-fields") - (version "15.2") + (version "16.2") (source (origin (method url-fetch) (uri (cran-uri "fields" version)) (sha256 - (base32 "0gdddigzbzlhrbp6h2ma5b05m68pmggrkcd80hzgjbjj64ihy9qz")))) + (base32 "1r5kld45dgigbaavcx3c88ci0jd66zxan3fh2wypwvj7sl69a41r")))) (build-system r-build-system) (propagated-inputs (list r-maps r-spam r-viridislite)) @@ -22207,13 +22276,13 @@ But it can also be used to do data analysis for small scale data sets.") (define-public r-cmprsk (package (name "r-cmprsk") - (version "2.2-11") + (version "2.2-12") (source (origin (method url-fetch) (uri (cran-uri "cmprsk" version)) (sha256 - (base32 "050f24l5ab1ds9824c7yjahimf6pg8ih2k83jzpzfb0n5k5jfh44")))) + (base32 "1p5c0i8prz88pgzb5dwpajlrxa0d72019sp9vysppb0fps9wngkp")))) (build-system r-build-system) (propagated-inputs (list r-survival)) @@ -22255,14 +22324,14 @@ model with finite state space using the Aalen-Johansen estimator.") (define-public r-epi (package (name "r-epi") - (version "2.48") + (version "2.51") (source (origin (method url-fetch) (uri (cran-uri "Epi" version)) (sha256 (base32 - "06965d2x47hb1c7dbqyhhywgr7k9xdcms1v08m2cx52qg6cdkiyp")))) + "0m9rvh21l9lqdlv71jrbix10g97wy2ryjv4zdjykfldhzzn4siik")))) (properties `((upstream-name . "Epi"))) (build-system r-build-system) (propagated-inputs @@ -23185,21 +23254,24 @@ marginal histograms/boxplots/density plots to ggplot2 scatterplots.") (define-public r-ggpattern (package (name "r-ggpattern") - (version "1.0.1") + (version "1.1.1") (source (origin (method url-fetch) (uri (cran-uri "ggpattern" version)) (sha256 - (base32 "1b9bfxlg64gr39bz58fp6jmg4nziwk8rk94rzpjsqhfhpwi2lrgr")))) + (base32 "1xlh1y6q10iqk1mbwdrr1vqmgmim3z27znbb5sbwgmm9yfxzj37s")))) (properties `((upstream-name . "ggpattern"))) (build-system r-build-system) (propagated-inputs - (list r-ggplot2 + (list r-cli + r-ggplot2 r-glue r-gridpattern + r-lifecycle r-rlang - r-scales)) + r-scales + r-vctrs)) (native-inputs (list r-knitr r-ragg r-rmarkdown)) (home-page "https://github.com/coolbutuseless/ggpattern") (synopsis "Ggplot2 pattern geoms") @@ -23302,14 +23374,14 @@ probabilities from a standard bivariate normal CDF.") (define-public r-lavaan (package (name "r-lavaan") - (version "0.6-17") + (version "0.6-18") (source (origin (method url-fetch) (uri (cran-uri "lavaan" version)) (sha256 (base32 - "1bppbv17b35h48vfci6zplix9zb5isi210za52cs9yyc68g2acwj")))) + "0lfz92dgqna6r6fcn2slads0gkqanqbny85jih9j08sadk6wl1xr")))) (build-system r-build-system) (propagated-inputs (list r-mass r-mnormt r-numderiv r-pbivnorm r-quadprog)) @@ -24020,13 +24092,13 @@ utilities for sequence data management under the ACNUC system.") (define-public r-unigd (package (name "r-unigd") - (version "0.1.1") + (version "0.1.2") (source (origin (method url-fetch) (uri (cran-uri "unigd" version)) (sha256 - (base32 "0q6nix6pqjg7adfyisg6zn7hzwkdmz1dhd34c6a58dsg2yq1qh1a")))) + (base32 "0iykjsfi8rjayrb4nhnm8ifdlsaxr7918bk6ackgfj1qz5g33wr7")))) (properties `((upstream-name . "unigd"))) (build-system r-build-system) (inputs (list cairo fontconfig freetype libpng zlib)) @@ -24089,6 +24161,41 @@ classes.") "This package provides simple bindings to Unidata's udunits library.") (license license:gpl2))) +(define-public r-clarabel + (package + (name "r-clarabel") + (version "0.9.0") + (source + (origin + (method url-fetch) + (uri (cran-uri "clarabel" version)) + (sha256 + (base32 "1g66y8s4v7qzm92dhnsmng28sm4lf6wggb4kc6arvp75z0i315jh")))) + (properties `((upstream-name . "clarabel"))) + (build-system r-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'set-variables-for-rust + (lambda _ + (setenv "CC" #$(cc-for-target))))))) + (native-inputs (list r-knitr rust `(,rust "cargo"))) + (home-page "https://oxfordcontrol.github.io/clarabel-r/") + (synopsis "Interior point conic optimization solver") + (description + "This package provides a versatile interior point solver that solves +@dfn{linear programs} (LPs), @dfn{quadratic programs} (QPs), @dfn{second-order +cone programs} (SOCPs), @dfn{semidefinite programs} (SDPs), and problems with +exponential and power cone constraints (@url{https://clarabel.org/stable/}). +For quadratic objectives, unlike interior point solvers based on the standard +@dfn{homogeneous self-dual embedding} (HSDE) model, Clarabel handles quadratic +objective without requiring any epigraphical reformulation of its objective +function. It can therefore be significantly faster than other HSDE-based +solvers for problems with quadratic objective functions. Infeasible problems +are detected using using a homogeneous embedding technique.") + (license license:asl2.0))) + (define-public r-classint (package (name "r-classint") @@ -24116,14 +24223,14 @@ univariate class intervals for mapping or other graphics purposes.") (define-public r-spdata (package (name "r-spdata") - (version "2.3.0") + (version "2.3.1") (source (origin (method url-fetch) (uri (cran-uri "spData" version)) (sha256 (base32 - "12w4chk71vqy1chij79928ppxdg2cz03hx9bgs5cgwj9f1ciyb2b")))) + "0x80qzn12lrr8al5igj5nass3aqasg65drhdrb2p9cmp4chpydwc")))) (properties `((upstream-name . "spData"))) (build-system r-build-system) (propagated-inputs @@ -24322,13 +24429,13 @@ or raster data cubes) are handled by package stars'.") (define-public r-spdep (package (name "r-spdep") - (version "1.3-3") + (version "1.3-5") (source (origin (method url-fetch) (uri (cran-uri "spdep" version)) (sha256 (base32 - "06j26v0w33vyh5ilq1cn0rh8z0lrr3n0lxwxc7bsk2w524d3v6yw")) + "09p6aqzg109vnbh56nf0v4qj34l4dmh8ak3d9y7l04mwvl3gm3ms")) (snippet '(for-each delete-file '("inst/doc/CO69.html" "inst/doc/CO69.R" @@ -24497,13 +24604,13 @@ lspec, polyclass, and polymars.") (define-public r-rms (package (name "r-rms") - (version "6.8-0") + (version "6.8-1") (source (origin (method url-fetch) (uri (cran-uri "rms" version)) (sha256 - (base32 "1cd6m6i2ild2f2x9rkyd2aqb33q3xy0596bs3dnvr2mnh5fcar5d")))) + (base32 "0sjr4lwvh05ji8s6jk2f4imnyzsaw8f1iqds8b1661s395bm8f4x")))) (build-system r-build-system) (propagated-inputs (list r-cluster @@ -24883,13 +24990,13 @@ that accept short and long options.") (define-public r-osqp (package (name "r-osqp") - (version "0.6.3.2") + (version "0.6.3.3") (source (origin (method url-fetch) (uri (cran-uri "osqp" version)) (sha256 (base32 - "0i1jh3fr8d45b7inq9s6iyqszhh18hps8jpzkm0hzgj2k8r3nm0q")))) + "1fzmw813iab07vnc714zyaszbnsagbmba7j69la36hvnqx78wggz")))) (properties `((upstream-name . "osqp"))) (build-system r-build-system) (propagated-inputs (list r-matrix r-r6 r-rcpp)) @@ -24994,14 +25101,14 @@ handle missing genotypes at some SNPs.") (define-public r-r2html (package (name "r-r2html") - (version "2.3.3") + (version "2.3.4") (source (origin (method url-fetch) (uri (cran-uri "R2HTML" version)) (sha256 (base32 - "12qg9rp1j26h2f48dfg5k9jds26ycacv3f3ymk686ks43hd1hzja")))) + "1a8yy9xf5gdh3s2rzmv5b28hhdqc5g34hygcrxn8drs0i2j97vdr")))) (properties `((upstream-name . "R2HTML"))) (build-system r-build-system) (home-page "https://github.com/nalimilan/R2HTML") @@ -25691,18 +25798,17 @@ proteomics applications).") (define-public r-pamr (package (name "r-pamr") - (version "1.56.2") + (version "1.57") (source (origin (method url-fetch) (uri (cran-uri "pamr" version)) (sha256 (base32 - "0n7wpgzdadngj44ddsg3171wap4qhiaap75ndr6g768r3mv6q119")))) + "0gdgaspan6j4qw98357mdk7rs6r1abzzfrp63jzf99gi41v8z5h1")))) (build-system r-build-system) (propagated-inputs (list r-cluster r-survival)) - (native-inputs (list gfortran)) (home-page "https://cran.r-project.org/web/packages/pamr/") (synopsis "Prediction Analysis for Microarrays") (description @@ -25812,14 +25918,14 @@ graphics using Vega.") (define-public r-gbm (package (name "r-gbm") - (version "2.1.9") + (version "2.2.2") (source (origin (method url-fetch) (uri (cran-uri "gbm" version)) (sha256 (base32 - "1r5d8mkg4z14l3743h39r35r0qqjx5p40ixdkcc5iyjab0fzm24x")))) + "1x64a0cq9ys49i3z4df0grk506n55i7yj1ljysf9g60cq6xd56h2")))) (build-system r-build-system) (propagated-inputs (list r-lattice r-survival)) @@ -25992,18 +26098,18 @@ function for computing a matrix of correlation p-values.") (define-public r-ggfun (package (name "r-ggfun") - (version "0.1.4") + (version "0.1.5") (source (origin (method url-fetch) (uri (cran-uri "ggfun" version)) (sha256 (base32 - "1i1kcpcy3ik5p9c8742cq3syg8civ7iq6ff1fr0240gl3ca1lx6w")))) + "1lqngd9333vlai88q2w5hrp9mmzdlvjx9pvn7zr9fx61d3yh2v7y")))) (properties `((upstream-name . "ggfun"))) (build-system r-build-system) (propagated-inputs - (list r-cli r-ggplot2 r-rlang)) + (list r-cli r-dplyr r-ggplot2 r-rlang)) (native-inputs (list r-knitr)) (home-page "https://cran.r-project.org/package=ggfun") (synopsis "Miscellaneous functions for ggplot2") @@ -26330,14 +26436,14 @@ external dependencies. This package has is implemented purely in R.") (define-public r-aplot (package (name "r-aplot") - (version "0.2.2") + (version "0.2.3") (source (origin (method url-fetch) (uri (cran-uri "aplot" version)) (sha256 (base32 - "094bzrcjybs2dk2plmxf80mbx9dz1hi5m7gp8bbs5qqh03xn7wf7")))) + "0shd66q2hagddc0nd96lljin0nyqwp1qq4b485r3z4wr042n5c0z")))) (properties `((upstream-name . "aplot"))) (build-system r-build-system) (propagated-inputs @@ -26401,14 +26507,14 @@ colored by the number of neighboring points. This is useful to visualize the (define-public r-arrow (package (name "r-arrow") - (version "15.0.1") + (version "16.1.0") (source (origin (method url-fetch) (uri (cran-uri "arrow" version)) (sha256 (base32 - "070pp0p5h1ij7pg34l5grrx4vwfihagnvnk4kj7l3w0gh8y88ibz")))) + "1vz7vjm8j1k1ng2za3y1qdsrzhbx2p6zy48vsas6bkdywxp5ihb6")))) (properties `((upstream-name . "arrow"))) (build-system r-build-system) (inputs @@ -26516,14 +26622,14 @@ on, for a performance vs accuracy trade-off.") (define-public r-rsparse (package (name "r-rsparse") - (version "0.5.1") + (version "0.5.2") (source (origin (method url-fetch) (uri (cran-uri "rsparse" version)) (sha256 (base32 - "15kdllm2lh6xdlv4j0ljyj5pczhx26s9d8cac7953zbb0sd45chz")))) + "0a40mhbzlakjsf6wj00p8pqr6slhn7gxsgq2rycp3yg478ajwqyp")))) (properties `((upstream-name . "rsparse"))) (build-system r-build-system) (propagated-inputs @@ -26975,14 +27081,14 @@ dimensional low-discrepancy sequence.") (define-public r-dqrng (package (name "r-dqrng") - (version "0.3.2") + (version "0.4.1") (source (origin (method url-fetch) (uri (cran-uri "dqrng" version)) (sha256 (base32 - "171y7487flla0vqxmzvf9nls7vn046vplcgzvyiva3d418hwl0nd")))) + "13r8agil10q0phzwh1vlsrwv7i15k43mc93iphw2ag0c08szk79x")))) (build-system r-build-system) (propagated-inputs (list r-bh r-rcpp r-sitmo)) @@ -27071,14 +27177,14 @@ classification and regression models.") (define-public r-dae (package (name "r-dae") - (version "3.2.25") + (version "3.2.28") (source (origin (method url-fetch) (uri (cran-uri "dae" version)) (sha256 (base32 - "168kisjgfc8cp7j6frgpci7qxw548rynpi9wv008k8hfszkfkgny")))) + "13a3j3d8qm1phkp4x0pdqa6p36j6xlakhmkrqcb9x0bpcfzbwfyl")))) (build-system r-build-system) (arguments '(#:phases @@ -28034,18 +28140,18 @@ both R code and compiled C/C++/FORTRAN code.") (define-public r-systemfonts (package (name "r-systemfonts") - (version "1.0.6") + (version "1.1.0") (source (origin (method url-fetch) (uri (cran-uri "systemfonts" version)) (sha256 (base32 - "1mqxb2njfnk5rfwkqc940xbpwd3dh25zac4sapv5mjyddrxnwn6i")))) + "0i5n7zhpmllgmz7064s3v85ycsvkrd9qr8r6q172h803sadhch8r")))) (properties `((upstream-name . "systemfonts"))) (build-system r-build-system) (propagated-inputs - (list r-cpp11)) + (list r-cpp11 r-lifecycle)) (inputs (list fontconfig freetype zlib)) (native-inputs @@ -28089,14 +28195,14 @@ emphasize hidden group structures in networks or focus on specific nodes.") (define-public r-terra (package (name "r-terra") - (version "1.7-71") + (version "1.7-78") (source (origin (method url-fetch) (uri (cran-uri "terra" version)) (sha256 (base32 - "0dq47d5irkplgxcv0h0xgawwf9cc48vygg94zdiqppg5cspz7dqx")))) + "0zjb5m5nh1r307g9lm5s6va5hsvmy4b06c7pznp724waknvmd2b5")))) (properties `((upstream-name . "terra"))) (build-system r-build-system) (inputs @@ -28215,14 +28321,14 @@ in pipelines.") (define-public r-parameters (package (name "r-parameters") - (version "0.21.6") + (version "0.22.0") (source (origin (method url-fetch) (uri (cran-uri "parameters" version)) (sha256 (base32 - "004ld3m9qdq3bwl8qmp3h700kzqlgbmgz739d7fpiqgrs0s2gv83")))) + "19g3sfmvvrarkgyl5p278fcpmybvsih8ancfbhp53w0gm80629z8")))) (properties `((upstream-name . "parameters"))) (build-system r-build-system) (propagated-inputs @@ -29478,14 +29584,14 @@ See e.g. Gentle (2003) @url{doi:10.1007/b97336}.") (define-public r-lhs (package (name "r-lhs") - (version "1.1.6") + (version "1.2.0") (source (origin (method url-fetch) (uri (cran-uri "lhs" version)) (sha256 (base32 - "0gyjdic714pqvq2jv1v0vh7hl9s83sg2zxx2gdkp38z6xx2cwzz3")))) + "0907icg9bl7h8a7wr8a60f59b8y89qj9rx1f7vxiybrjdcy7fjvb")))) (properties `((upstream-name . "lhs"))) (build-system r-build-system) (propagated-inputs (list r-rcpp)) @@ -31211,13 +31317,13 @@ It also provides a small number of bug fixes to the original code.") (define-public r-torch (package (name "r-torch") - (version "0.12.0") + (version "0.13.0") (source (origin (method url-fetch) (uri (cran-uri "torch" version)) (sha256 - (base32 "024c8szg3xa2zrl5406jx3bmazbjwp2f07ja7m61ja0dr3z7lvbq")))) + (base32 "1vy855ahji98np2q5j5fag2zcnv4ki5mysxwg3y5kdns6mifd5ns")))) (properties `((upstream-name . "torch"))) (build-system r-build-system) (arguments @@ -31270,14 +31376,14 @@ also supports low-level tensor operations and GPU acceleration.") (define-public r-additivitytests (package (name "r-additivitytests") - (version "1.1-4.1") + (version "1.1-4.2") (source (origin (method url-fetch) (uri (cran-uri "additivityTests" version)) (sha256 (base32 - "00kzfv86z6kk0gvbz9mg3p6xi5fb8cn74rhslr17rdpd02md0884")))) + "07fms1mf71ycq6w2k3hmgl6q3sc5x4qkm7d0diymbbgpbpxggwh8")))) (properties `((upstream-name . "additivityTests"))) (build-system r-build-system) @@ -32178,14 +32284,14 @@ Raftery, Appl.Statistics, 1989); it includes inference and basic methods.") (define-public r-forecast (package (name "r-forecast") - (version "8.22.0") + (version "8.23.0") (source (origin (method url-fetch) (uri (cran-uri "forecast" version)) (sha256 (base32 - "09s5fdyzc6f5l8dy7ynjmd6l5fk3wvz59q0kfv2fd9da5c1mqd8w")))) + "100qi8cgr5dz3qskrgrsjn77m7szs5rfpgqfdwlgp67l708x9hzz")))) (properties `((upstream-name . "forecast"))) (build-system r-build-system) (propagated-inputs @@ -32201,6 +32307,7 @@ Raftery, Appl.Statistics, 1989); it includes inference and basic methods.") r-timedate r-tseries r-urca + r-withr r-zoo)) (native-inputs (list r-knitr)) ; needed for vignettes @@ -32773,14 +32880,14 @@ perform @dfn{exploratory mediation} (XMed).") (define-public r-stanheaders (package (name "r-stanheaders") - (version "2.32.7") + (version "2.32.9") (source (origin (method url-fetch) (uri (cran-uri "StanHeaders" version)) (sha256 (base32 - "1dlgq0laz5j4ryiz589xhd97fk89q63255wkdbddixfg6cq02ypf")))) + "0cqb5q9pi02vahr4fif07p4r3p2sik953a9i78z1j00j9srzxc17")))) (properties `((upstream-name . "StanHeaders"))) (build-system r-build-system) (inputs (list pandoc)) @@ -33346,14 +33453,14 @@ and reproducible way.") (define-public r-rsconnect (package (name "r-rsconnect") - (version "1.2.2") + (version "1.3.1") (source (origin (method url-fetch) (uri (cran-uri "rsconnect" version)) (sha256 (base32 - "19n0j7g2yy45qp5zgs5lz1cm1d7p6d0h8bwqcsfp9mnr2zzc0yr5")))) + "0msmrdw7933xics464asyy9v2gm5b4jb8gr4nfhy54x45n1qmpj7")))) (properties `((upstream-name . "rsconnect"))) (build-system r-build-system) (propagated-inputs @@ -33370,7 +33477,7 @@ and reproducible way.") r-rstudioapi r-yaml)) (native-inputs - (list r-knitr)) + (list r-knitr r-rmarkdown)) (home-page "https://github.com/rstudio/rsconnect") (synopsis "Deployment interface for R Markdown documents and Shiny applications") (description @@ -34739,14 +34846,14 @@ multi-state models.") (define-public r-scatterpie (package (name "r-scatterpie") - (version "0.2.2") + (version "0.2.3") (source (origin (method url-fetch) (uri (cran-uri "scatterpie" version)) (sha256 (base32 - "1q36g6rqggrysnjqarxbyjw3y3z244k0zh1a49w6j4149k8qc462")))) + "0iv4i775s22j3wg6mhsdx5d9zdb23v4fanfnznp2jiwkzxr10kvh")))) (properties `((upstream-name . "scatterpie"))) (build-system r-build-system) (propagated-inputs @@ -34909,14 +35016,14 @@ counting and recursive k-means partitioning.") (define-public r-hardhat (package (name "r-hardhat") - (version "1.3.1") + (version "1.4.0") (source (origin (method url-fetch) (uri (cran-uri "hardhat" version)) (sha256 (base32 - "0v0vvvyy075f0j9ppqkhys6w2k7zmfdg0v77l430582nhrvp99hf")))) + "1bdkn80ab25n1rn3n3x1b3gs157888fak3s7i7c0r54gzkfj7l26")))) (properties `((upstream-name . "hardhat"))) (build-system r-build-system) (propagated-inputs @@ -34939,14 +35046,14 @@ input.") (define-public r-lightgbm (package (name "r-lightgbm") - (version "4.3.0") + (version "4.4.0") (source (origin (method url-fetch) (uri (cran-uri "lightgbm" version)) (sha256 (base32 - "1kk2jj7d1adqi9x1q3jij7fy8h9vc6bvzcz7jhi4bd9cybw8gpnh")))) + "082xmr33ki16i52a3z6lv9niv46pi4dbp0j3qn421sxml4115sf1")))) (properties `((upstream-name . "lightgbm"))) (build-system r-build-system) (propagated-inputs @@ -35468,14 +35575,14 @@ Kolmogorov-Smirnov, ANOVA) are also supported.") (define-public r-spatstat-utils (package (name "r-spatstat-utils") - (version "3.0-4") + (version "3.0-5") (source (origin (method url-fetch) (uri (cran-uri "spatstat.utils" version)) (sha256 (base32 - "1i1w1ys29s22jfjvliqnbw3zi6zar8bxxz3r8za182p2w0wqwhax")))) + "15pm4fpc3fvqkh9kh4i0pgalxbxfp9y3blsyaw37s07v41gnd67b")))) (properties `((upstream-name . "spatstat.utils"))) (build-system r-build-system) @@ -35489,14 +35596,14 @@ which may also be useful for other purposes.") (define-public r-spatstat-sparse (package (name "r-spatstat-sparse") - (version "3.0-3") + (version "3.1-0") (source (origin (method url-fetch) (uri (cran-uri "spatstat.sparse" version)) (sha256 (base32 - "0scdk3ns4nl1v1avbggnsinfpvl4i8391qy3x1iwxvkimr14xg3b")))) + "1sdv9d3f5xc87qiwbfjikl12h2vkmdfq2faal5wbhfc3h72mvgk3")))) (properties `((upstream-name . "spatstat.sparse"))) (build-system r-build-system) @@ -35513,14 +35620,14 @@ matrix calculations that are common in statistics, such as quadratic forms.") (define-public r-spatstat-data (package (name "r-spatstat-data") - (version "3.0-4") + (version "3.1-2") (source (origin (method url-fetch) (uri (cran-uri "spatstat.data" version)) (sha256 (base32 - "1s0ns5nhgigfn3d9rdy3f4ymnwj1w71v26iphkhwxddm9qzk80yi")))) + "0xqb94xm095qwxkhfrjqv7qwyxfs9i2xrwq06ir0y15q0dil36wv")))) (properties `((upstream-name . "spatstat.data"))) (build-system r-build-system) (propagated-inputs @@ -35826,14 +35933,14 @@ model.") (define-public r-clusterr (package (name "r-clusterr") - (version "1.3.2") + (version "1.3.3") (source (origin (method url-fetch) (uri (cran-uri "ClusterR" version)) (sha256 (base32 - "1bs1sl3yy90zx4ni0lhvdivzfas6i4v9203m59njvk5df9x82ffp")))) + "0vmj0q6sjh8adr22mhm6hyfnzsw09dk1qn75rz5i3mmhrd7y7mr6")))) (properties `((upstream-name . "ClusterR"))) (build-system r-build-system) (propagated-inputs @@ -37285,14 +37392,14 @@ expressive statistical grammar that coheres with the Tidy design framework.") (define-public r-modeldata (package (name "r-modeldata") - (version "1.3.0") + (version "1.4.0") (source (origin (method url-fetch) (uri (cran-uri "modeldata" version)) (sha256 (base32 - "035gyxgs9byij9d5vpw35a96f7xlhfj3k6c140mql4yfplm5rk23")))) + "15cfvvhf1c8zaanxdrrh934kz8250j0r5k6df0qkl5dz8cqv8sgb")))) (properties `((upstream-name . "modeldata"))) (build-system r-build-system) (propagated-inputs @@ -37596,12 +37703,12 @@ genome scans.") (define-public r-qtl2 (package (name "r-qtl2") - (version "0.34") + (version "0.36") (source (origin (method url-fetch) (uri (cran-uri "qtl2" version)) (sha256 - (base32 "1h3wim850b2xk09z9vgnyfp20k7vg94zf7szcrlw5nf1w9gn4wzy")))) + (base32 "0sy4j3f1dw7w7qcp3lsc5mmd8kwa5qaxcl8c4236a8zbzkvvnp5j")))) (build-system r-build-system) (propagated-inputs (list r-data-table @@ -38280,13 +38387,13 @@ well as email and push notifications.") (define-public r-mlr (package (name "r-mlr") - (version "2.19.1") + (version "2.19.2") (source (origin (method url-fetch) (uri (cran-uri "mlr" version)) (sha256 (base32 - "00jjhvaqifj6glqsyzixlp56bvlch5smck8kk3klcmwx9pasyllx")))) + "1icpa3xa0f7l40i52l3pl43m98j69r75qnqf1yp7wyh6y54p1rl5")))) (properties `((upstream-name . "mlr"))) (build-system r-build-system) (inputs (list gdal @@ -38449,13 +38556,13 @@ supported. Partial scoring of multivariate filter methods is supported.") (define-public r-mlr3fselect (package (name "r-mlr3fselect") - (version "0.12.0") + (version "1.0.0") (source (origin (method url-fetch) (uri (cran-uri "mlr3fselect" version)) (sha256 - (base32 "1f18y4ahnjzlwk9pfs87i80kb6z84hgyc5cdlj3mafawq790hg1h")))) + (base32 "0bw5gxcxydvh14j6zy9q1k32b84v76lm6ksa4dh1l6pck14a76pj")))) (properties `((upstream-name . "mlr3fselect"))) (build-system r-build-system) (propagated-inputs (list r-bbotk @@ -38465,7 +38572,8 @@ supported. Partial scoring of multivariate filter methods is supported.") r-mlr3 r-mlr3misc r-paradox - r-r6)) + r-r6 + r-stabm)) (home-page "https://mlr3fselect.mlr-org.com") (synopsis "Feature selection for mlr3") (description @@ -38479,13 +38587,13 @@ the performance of optimized feature sets with nested resampling.") (define-public r-mlr3hyperband (package (name "r-mlr3hyperband") - (version "0.5.0") + (version "0.6.0") (source (origin (method url-fetch) (uri (cran-uri "mlr3hyperband" version)) (sha256 - (base32 "1x6vfhadxlb4c9q61d5qv957mkyfwdwchzbg3flfd0j28b4bck1p")))) + (base32 "1sr9bccy1zmbj83i6nlwkfmi98b40bl1l9q4lzl8n0knnavnzcj7")))) (properties `((upstream-name . "mlr3hyperband"))) (build-system r-build-system) (propagated-inputs (list r-bbotk @@ -38510,13 +38618,13 @@ black-box optimization in bbotk.") (define-public r-mlr3mbo (package (name "r-mlr3mbo") - (version "0.2.2") + (version "0.2.3") (source (origin (method url-fetch) (uri (cran-uri "mlr3mbo" version)) (sha256 - (base32 "0jdj5dx6jb7n0g950h0j8jhafdj5mcalv5vxfiyf07myr6mjipri")))) + (base32 "0qdd0g8qnfrafkqw79mhb652chf7lqmkcyra6afxamy7jardjr0g")))) (properties `((upstream-name . "mlr3mbo"))) (build-system r-build-system) (propagated-inputs (list r-bbotk @@ -38568,13 +38676,13 @@ are.") (define-public r-mlr3misc (package (name "r-mlr3misc") - (version "0.15.0") + (version "0.15.1") (source (origin (method url-fetch) (uri (cran-uri "mlr3misc" version)) (sha256 (base32 - "1l40l0sx1dgs2rdblx7pd9nk93flad6y1mvppzg7qf4cyn8gfc3x")))) + "1yakq3ir3i46h1a1vnqqdlp4qznnwwk7zmjv7v831jmah9fzf5m3")))) (build-system r-build-system) (propagated-inputs (list r-backports r-checkmate r-data-table r-digest r-r6)) @@ -38590,13 +38698,13 @@ package also supersedes the package @code{BBmisc}.") (define-public r-mlr3pipelines (package (name "r-mlr3pipelines") - (version "0.5.2") + (version "0.6.0") (source (origin (method url-fetch) (uri (cran-uri "mlr3pipelines" version)) (sha256 (base32 - "1glp4z5wnvcsil37gzvbvazn73088vilks9c5limnwhz8f454147")))) + "09wivgnj3jj39ngrxjip6ss0138fvjsmn4dmi5v0a78ppvsr96sp")))) (build-system r-build-system) (propagated-inputs (list r-backports @@ -38654,13 +38762,13 @@ performing ordinal regression.") (define-public r-mlr3tuningspaces (package (name "r-mlr3tuningspaces") - (version "0.5.0") + (version "0.5.1") (source (origin (method url-fetch) (uri (cran-uri "mlr3tuningspaces" version)) (sha256 - (base32 "1snrd7xq388mvqh0ydaxvx8k9iwp40g06c3irp0m718jw3wsz5vm")))) + (base32 "0zcmhzrr9b3blg49dx3zmxnm5qh87k0rlka0vk2jp59ifd2yggrr")))) (properties `((upstream-name . "mlr3tuningspaces"))) (build-system r-build-system) (propagated-inputs (list r-checkmate @@ -38682,13 +38790,13 @@ work for a wide range of data sets.") (define-public r-mlr3verse (package (name "r-mlr3verse") - (version "0.2.8") + (version "0.3.0") (source (origin (method url-fetch) (uri (cran-uri "mlr3verse" version)) (sha256 - (base32 "0ld4vch1qdq3gh8vhj38s2wz7acn5z7f8hxmnwnrq22g44gckd8s")))) + (base32 "1azkpmkki8c02vpz98ixsx17civk86dq7c8wwnvm9jlg3spr8hhd")))) (properties `((upstream-name . "mlr3verse"))) (build-system r-build-system) (propagated-inputs (list r-bbotk @@ -38718,13 +38826,13 @@ installation and loading of the core mlr3 packages.") (define-public r-mlr3viz (package (name "r-mlr3viz") - (version "0.8.0") + (version "0.9.0") (source (origin (method url-fetch) (uri (cran-uri "mlr3viz" version)) (sha256 - (base32 "1m2f54yqhk1bd4c30vd1z509yblz6y4i8qkwhg73aa1sflnsycvf")))) + (base32 "1dm0xkrmd4c9hs22rxpxvvd4xxki4nxh2x7s06s2d7n3dhr4l3xh")))) (properties `((upstream-name . "mlr3viz"))) (build-system r-build-system) (propagated-inputs (list r-checkmate @@ -38746,16 +38854,17 @@ barplots, boxplots, histograms, ROC curves, and precision-recall curves.") (define-public r-paradox (package (name "r-paradox") - (version "0.11.1") + (version "1.0.0") (source (origin (method url-fetch) (uri (cran-uri "paradox" version)) (sha256 (base32 - "0igza40ycirnf5chs7z2nnh0w6d48v4wv102zn2vnvh0kkvgv3hd")))) + "0lll3sjyn0hmxfzg71zk53f3fddibvq7762ax7gxjgiy6zgi9mny")))) (build-system r-build-system) (propagated-inputs (list r-backports r-checkmate r-data-table r-mlr3misc r-r6)) + (native-inputs (list r-knitr)) (home-page "https://paradox.mlr-org.com/") (synopsis "Define and work with parameter spaces for complex algorithms") (description "With this package it is possible to define parameter spaces, @@ -38767,13 +38876,13 @@ implemented as @code{R6} classes.") (define-public r-mlr3 (package (name "r-mlr3") - (version "0.19.0") + (version "0.20.0") (source (origin (method url-fetch) (uri (cran-uri "mlr3" version)) (sha256 (base32 - "0dgik4lfrw5m2sqxp33kzkdp7ihlcm27y5p5g5b9wah7h7ramiqs")))) + "1wqcvgqjwfp9lah6kpxcwsz5cpd57agxfjhhggfzp8lnva5p443v")))) (build-system r-build-system) (propagated-inputs (list r-backports @@ -38805,13 +38914,13 @@ computational operations, add-on packages provide additional functionality.") (define-public r-mlr3learners (package (name "r-mlr3learners") - (version "0.6.0") + (version "0.7.0") (source (origin (method url-fetch) (uri (cran-uri "mlr3learners" version)) (sha256 (base32 - "06gz6h19cnb62js1b35nddy453dyj64mr788p8ww56kgfk6yzxr8")))) + "0skfxmmqxfxxm0m9r46pvixnlpqfjqb3hmg2ggvgjnk47klha8v2")))) (build-system r-build-system) (propagated-inputs (list r-checkmate @@ -38832,14 +38941,14 @@ vector machines, and gradient boosting.") (define-public r-bbotk (package (name "r-bbotk") - (version "0.8.0") + (version "1.0.0") (source (origin (method url-fetch) (uri (cran-uri "bbotk" version)) (sha256 (base32 - "1ggfl1lhvjnnkxib4svqd82agrvjcg1101cbf4g2c0kzgzm1jaj6")))) + "0w1f54lwhllf16iw9irgfv4nsn26ikw1m3wlrk5ilcs3z83zakk8")))) (properties `((upstream-name . "bbotk"))) (build-system r-build-system) (propagated-inputs @@ -38862,13 +38971,13 @@ annealing.") (define-public r-mlr3tuning (package (name "r-mlr3tuning") - (version "0.20.0") + (version "1.0.0") (source (origin (method url-fetch) (uri (cran-uri "mlr3tuning" version)) (sha256 (base32 - "1y1cqfqdx9v0lfb4619y2hw6clhhjzi7hjwrpwzdpd7ymcx3dgi3")))) + "0lmczwydnd2fbvb43vqxvy58clygipwpqrnydhc8hlmnjy9vbzc6")))) (build-system r-build-system) (propagated-inputs (list r-bbotk @@ -39128,20 +39237,20 @@ clusterings as resolution increases.") (define-public r-textshaping (package (name "r-textshaping") - (version "0.3.7") + (version "0.4.0") (source (origin (method url-fetch) (uri (cran-uri "textshaping" version)) (sha256 (base32 - "0hpcjz66ykji89g2lzpp6hfkz10388py8vn2ss08n4xl3yz4v4ps")))) + "0ylx4fdvm64cxcy62q84in3nrj7q8r7mvd8vwq6mcy5jddw41s9m")))) (properties `((upstream-name . "textshaping"))) (build-system r-build-system) (inputs (list freetype fribidi harfbuzz zlib)) (propagated-inputs - (list r-cpp11 r-systemfonts)) + (list r-cpp11 r-lifecycle r-systemfonts)) (native-inputs (list pkg-config r-knitr)) (home-page "https://github.com/r-lib/textshaping") @@ -39156,14 +39265,14 @@ the font tool-set provided by the @code{systemfonts} package.") (define-public r-ragg (package (name "r-ragg") - (version "1.3.1") + (version "1.3.2") (source (origin (method url-fetch) (uri (cran-uri "ragg" version)) (sha256 (base32 - "1p3bhbcgkllgmby9rdc1hillb5qgmc22blpmvdhd5j9ndywv2h0w")))) + "0cb9dcp47pl0nizwy0a2ml8hm11bhf7ay20j237hmmgx159a8dw0")))) (properties `((upstream-name . "ragg"))) (build-system r-build-system) (inputs @@ -39184,14 +39293,14 @@ AGG to use as alternative to the raster devices provided through the (define-public r-downlit (package (name "r-downlit") - (version "0.4.3") + (version "0.4.4") (source (origin (method url-fetch) (uri (cran-uri "downlit" version)) (sha256 (base32 - "1gdk6rj3539vnm979spd8py0rpvlaniyiy336abi39g8xjcbw3vc")))) + "0a7q90623ahcadqg0b3a0qylachq7nghf50f0v0lip2axvf7ghsm")))) (properties `((upstream-name . "downlit"))) (build-system r-build-system) (propagated-inputs @@ -39654,20 +39763,19 @@ functionalities in strex.") (define-public r-readods (package (name "r-readods") - (version "2.2.0") + (version "2.3.0") (source (origin (method url-fetch) (uri (cran-uri "readODS" version)) (sha256 (base32 - "1f87bnvjxalr0gp651axpyq4abzirxq7l3mirbak0c4b4l2phb1n")))) + "14849i7c48ilx212kp5zh33fkvps7j2b89kpy007wk5kzpw0y4hy")))) (properties `((upstream-name . "readODS"))) (build-system r-build-system) (propagated-inputs (list r-cellranger - r-cpp11 - r-readr + r-minty r-stringi r-tibble r-vctrs @@ -40095,14 +40203,14 @@ BTM-WWW13.pdf}.") (define-public r-delaporte (package (name "r-delaporte") - (version "8.4.0") + (version "8.4.1") (source (origin (method url-fetch) (uri (cran-uri "Delaporte" version)) (sha256 (base32 - "1jqz2qxig35rhmwvazmsl3a081dylfq2jfz3bjpj61y4c55mnwar")))) + "1gv0js21x5sh54vjkvyh41ph1ixk1nw7ajm111fwz95prd9wx04v")))) (properties `((upstream-name . "Delaporte"))) (build-system r-build-system) (native-inputs (list gfortran)) @@ -40572,13 +40680,13 @@ reading and writing arbitrary protocol-buffer data in R.") (define-public r-opencpu (package (name "r-opencpu") - (version "2.2.11") + (version "2.2.12") (source (origin (method url-fetch) (uri (cran-uri "opencpu" version)) (sha256 - (base32 "1hdvfbzc8xmv8hrmchad590f91s4vq1nq83wi2ffh4n7q6ixr03s")) + (base32 "144rq0lyag4b93gshjaf4zghshnvx5vcbnahy4x43f22r0zq5gkv")) (snippet '(for-each delete-file '("inst/test/jquery-1.10.2.min.js" @@ -40707,14 +40815,14 @@ the @code{raster} package that is suitable for extracting raster values using (define-public r-rapiserialize (package (name "r-rapiserialize") - (version "0.1.2") + (version "0.1.3") (source (origin (method url-fetch) (uri (cran-uri "RApiSerialize" version)) (sha256 (base32 - "02k0l8bi849b2102ysb102xky4p84i9v2r4w6fab7bgf32wvph4w")))) + "0azl8qykls635qxd4lcqmznvpqb5ldy6hqx3p7icqamvx9ckfhcz")))) (properties `((upstream-name . "RApiSerialize"))) (build-system r-build-system) (home-page @@ -40731,17 +40839,17 @@ package.") (define-public r-qs (package (name "r-qs") - (version "0.26.1") + (version "0.26.3") (source (origin (method url-fetch) (uri (cran-uri "qs" version)) (sha256 (base32 - "0qmgnc4igy8mjzarm30cgi4z75hh8f01kvcs6n6s63cy4qk30vs6")))) + "1qqy6aada9jkq0z6bmzb5vhb18cdxvy7b6nwjd8saqaidqgs80c8")))) (properties `((upstream-name . "qs"))) (build-system r-build-system) - (inputs (list lz4 (list zstd "lib"))) + (inputs (list lz4 zlib (list zstd "lib"))) (propagated-inputs (list r-bh r-rapiserialize r-rcpp r-stringfish)) (native-inputs @@ -41169,14 +41277,14 @@ fully reproducible.") (define-public r-paws-common (package (name "r-paws-common") - (version "0.7.2") + (version "0.7.3") (source (origin (method url-fetch) (uri (cran-uri "paws.common" version)) (sha256 (base32 - "0d1gj8z3c592cadngfhp8w8m6nd1ffb8k0wj8r2w1bldniq5yx70")))) + "1h7xsddwjhjx5n3fns16nhk249h6mypk80d3jp7lwpianhdll90m")))) (properties `((upstream-name . "paws.common"))) (build-system r-build-system) (propagated-inputs @@ -41224,14 +41332,14 @@ service, and more.") (define-public r-paws-cost-management (package (name "r-paws-cost-management") - (version "0.5.0") + (version "0.6.1") (source (origin (method url-fetch) (uri (cran-uri "paws.cost.management" version)) (sha256 (base32 - "1fvxird0kmwhj930j7hm95h34c0vsf8p0lh6qrnz9d9i689fiw92")))) + "03mpmwg3lnky9ylpc4707a10y7b1hv228c0jc0yik0zfvrka0h64")))) (properties `((upstream-name . "paws.cost.management"))) (build-system r-build-system) @@ -41316,14 +41424,14 @@ Simple Notification Service (SNS) publish/subscribe messaging, and more.") (define-public r-paws-security-identity (package (name "r-paws-security-identity") - (version "0.5.0") + (version "0.6.1") (source (origin (method url-fetch) (uri (cran-uri "paws.security.identity" version)) (sha256 (base32 - "01gh761ykc4h81whn649bm28b01njqm1kjqkn9l4n7hhnalddy06")))) + "14zcvd2cf2015r7b4y69176czznz69nzjp344ys262a8r31nliz5")))) (properties `((upstream-name . "paws.security.identity"))) (build-system r-build-system) @@ -41389,14 +41497,14 @@ natural language processing, speech recognition, translation, and more.") (define-public r-paws-management (package (name "r-paws-management") - (version "0.5.0") + (version "0.6.1") (source (origin (method url-fetch) (uri (cran-uri "paws.management" version)) (sha256 (base32 - "0k40lrgxx91bijj3648zsgj55x120mhmx8dyx3hm2yvh2k96ks7h")))) + "0yxh3lr5b9cgsq9gmbjwfikiv38wa4d82mrq0fdqidhcsqfbz62g")))) (properties `((upstream-name . "paws.management"))) (build-system r-build-system) @@ -41483,14 +41591,14 @@ services, including Simple Storage Service (S3).") (define-public r-paws-compute (package (name "r-paws-compute") - (version "0.5.0") + (version "0.6.1") (source (origin (method url-fetch) (uri (cran-uri "paws.compute" version)) (sha256 (base32 - "1vsxwzqgk0004nmfy79pd0zc208fczay95p7h16mzqgds9586ma1")))) + "0s1d7gj7lb6fra4l6h3c74v3hsp701qbiqirnk0q0qm7ild5399r")))) (properties `((upstream-name . "paws.compute"))) (build-system r-build-system) (propagated-inputs @@ -41506,14 +41614,14 @@ functions-as-a-service, containers, batch processing, and more.") (define-public r-paws (package (name "r-paws") - (version "0.5.0") + (version "0.6.0") (source (origin (method url-fetch) (uri (cran-uri "paws" version)) (sha256 (base32 - "1dwk1fnsrykvgz4l3hiapcqvvajwr3kmwxl3gza07nh573j8439h")))) + "1w8jzkcr86s67rclx994zkfwqqy02mlj2gk52a198dxg737w5nw0")))) (properties `((upstream-name . "paws"))) (build-system r-build-system) (propagated-inputs @@ -41626,14 +41734,14 @@ internally managed by a zoolog thesaurus.") (define-public r-filehash (package (name "r-filehash") - (version "2.4-5") + (version "2.4-6") (source (origin (method url-fetch) (uri (cran-uri "filehash" version)) (sha256 (base32 - "0b52bnsqp65s3r4aw9mvfwfnjmsrqq8ndcadwig547nn9mwy47iv")))) + "1cc1xq6vpk5cmsr4w5i6nvkx36grd38dds4lys4gmijlldml92sm")))) (properties `((upstream-name . "filehash"))) (build-system r-build-system) (propagated-inputs (list r-digest)) @@ -42152,27 +42260,27 @@ present in the @code{testthat} package.") (define-public r-zoltr (package (name "r-zoltr") - (version "0.5.1") + (version "1.0.1") (source (origin (method url-fetch) (uri (cran-uri "zoltr" version)) (sha256 (base32 - "12zh7y3pwidclscgvd0b0iaqq9j5y8mc8xd6pz4vs0jy5qs3ahar")))) + "0j1zyclfhl1njwyg7x4jg4vqaphiikplqa8b4ch9hrzlvjjw7zk8")))) (properties `((upstream-name . "zoltr"))) (build-system r-build-system) (propagated-inputs (list r-base64url + r-data-table r-dplyr r-httr r-jsonlite + r-lubridate r-magrittr r-mmwrweek - r-mockery r-readr - r-rlang - r-webmockr)) + r-rlang)) (native-inputs (list r-knitr)) (home-page "https://github.com/reichlab/zoltr") (synopsis "Interface to the Zoltar forecast repository API") @@ -42456,13 +42564,13 @@ for rendering equations in the HTML help files.") (define-public r-spacefillr (package (name "r-spacefillr") - (version "0.3.2") + (version "0.3.3") (source (origin (method url-fetch) (uri (cran-uri "spacefillr" version)) (sha256 (base32 - "0raaw9ib8b2dzkh4w28wpxcgxs7ky328yaayb64lc39syf7g19dv")))) + "08ghp7ym454911yymqa15mq8d3my2qpc7mphj17akm8pyskymnkc")))) (properties `((upstream-name . "spacefillr"))) (build-system r-build-system) (propagated-inputs (list r-rcpp)) diff --git a/gnu/packages/crates-apple.scm b/gnu/packages/crates-apple.scm index 1c06ab4ad8..11ceb517d3 100644 --- a/gnu/packages/crates-apple.scm +++ b/gnu/packages/crates-apple.scm @@ -143,14 +143,14 @@ extension of blocks.") (define-public rust-cargo-credential-macos-keychain-0.4 (package (name "rust-cargo-credential-macos-keychain") - (version "0.4.1") + (version "0.4.3") (source (origin (method url-fetch) (uri (crate-uri "cargo-credential-macos-keychain" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1df098axn8pab6l2mljbkxg3bw1v4mcr4k42x6xy6j15854nsz70")))) + (base32 "1ls1ak7xmjw5h04h1sqxz8fyiq7w6xva5kavfkrs7rgplgh0049n")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-cargo-credential" ,rust-cargo-credential-0.4) diff --git a/gnu/packages/crates-crypto.scm b/gnu/packages/crates-crypto.scm index d4205f7d70..422edfbc1d 100644 --- a/gnu/packages/crates-crypto.scm +++ b/gnu/packages/crates-crypto.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2019, 2020 John Soo <jsoo1@asu.edu> ;;; Copyright © 2020 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2020 Arun Isaac <arunisaac@systemreboot.net> -;;; Copyright © 2020, 2022, 2023 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2020, 2022-2024 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2020 Valentin Ignatev <valentignatev@gmail.com> ;;; Copyright © 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2021 Vinicius Monego <monego@posteo.net> @@ -16,6 +16,7 @@ ;;; Copyright © 2023 Steve George <steve@futurile.net> ;;; Copyright © 2023 VÖRÖSKŐI András <voroskoi@gmail.com> ;;; Copyright © 2024 Wilko Meyer <w@wmeyer.eu> +;;; Copyright © 2024 Herman Rimm <herman@rimm.ee> ;;; ;;; This file is part of GNU Guix. ;;; @@ -155,14 +156,14 @@ with Associated Data (AEAD) algorithms.") (define-public rust-aes-0.8 (package (name "rust-aes") - (version "0.8.3") + (version "0.8.4") (source (origin (method url-fetch) (uri (crate-uri "aes" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1qi7z96wf3zd6alg116nh2myp34bw2574jwly4zrhpz9k19887xc")))) + (base32 "1853796anlwp4kqim0s6wm1srl4ib621nm0cl2h3c8klsjkgfsdi")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -192,13 +193,14 @@ ciphers implementations.") (sha256 (base32 "1f0sdx2fsa8w3l7xzsyi9ry3shvnnsgc0znh50if9fm95vslg2wy")))) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-1) ("rust-cipher" ,rust-cipher-0.3) ("rust-cpufeatures" ,rust-cpufeatures-0.2) ("rust-ctr" ,rust-ctr-0.8) - ("rust-opaque-debug" ,rust-opaque-debug-0.3)))))) + ("rust-opaque-debug" ,rust-opaque-debug-0.3)) + #:cargo-development-inputs (("rust-cipher" ,rust-cipher-0.3) + ("rust-hex-literal" ,rust-hex-literal-0.2)))))) (define-public rust-aes-0.6 (package @@ -318,6 +320,36 @@ Data (AEAD) Cipher with optional architecture-specific hardware acceleration.") (license (list license:asl2.0 license:expat)))) +(define-public rust-aes-gcm-0.9 + (package + (inherit rust-aes-gcm-0.10) + (name "rust-aes-gcm") + (version "0.9.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "aes-gcm" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1xndncn1phjb7pjam63vl0yp7h8jh95m0yxanr1092vx7al8apyz")) + (modules '((guix build utils))) + (snippet + '(begin (substitute* "Cargo.toml" + (((string-append ">=([[:digit:]]+(\\.[[:digit:]]+)*)," + " <([[:digit:]]+(\\.[[:digit:]]+)*)") + _ version _) + (string-append ">=" version))))))) + (arguments + `(#:cargo-inputs (("rust-aead" ,rust-aead-0.4) + ("rust-aes" ,rust-aes-0.7) + ("rust-cipher" ,rust-cipher-0.3) + ("rust-ctr" ,rust-ctr-0.8) + ("rust-ghash" ,rust-ghash-0.4) + ("rust-subtle" ,rust-subtle-2) + ("rust-zeroize" ,rust-zeroize-1)) + #:cargo-development-inputs (("rust-aead" ,rust-aead-0.4) + ("rust-hex-literal" ,rust-hex-literal-0.3)))))) + (define-public rust-aes-gcm-0.8 (package (inherit rust-aes-gcm-0.10) @@ -615,18 +647,18 @@ portable \"best effort\" constant-time operation and embedded-friendly @code{no_std} support.") (license (list license:asl2.0 license:expat)))) -(define-public rust-base64ct-1.0.1 +(define-public rust-base64ct-1.1 (package (inherit rust-base64ct-1) (name "rust-base64ct") - (version "1.0.1") + (version "1.1.1") (source (origin (method url-fetch) (uri (crate-uri "base64ct" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0sx4a44c2n450lsmi0q1mgfbjhkw1sx57462cv77p0mmy9mgscla")))) + (base32 "0p4was874qc90q2chm2i14m9mn8zmxjis8vaxihd6a2x4aqxkd76")))) (arguments '()))) (define-public rust-blake2-0.10 @@ -703,20 +735,20 @@ portable \"best effort\" constant-time operation and embedded-friendly (define-public rust-blake2b-simd-1 (package (name "rust-blake2b-simd") - (version "1.0.1") + (version "1.0.2") (source (origin (method url-fetch) (uri (crate-uri "blake2b_simd" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1g04mc4gf6jyymyj41749jhhplm3ymnc6z7rhkc1fqwclv4hsbrw")))) + "102pfciq6g59hf47gv6kix42cgpqw8pjyf9hx0r3jyb94b9mla13")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-arrayref" ,rust-arrayref-0.3) ("rust-arrayvec" ,rust-arrayvec-0.7) - ("rust-constant-time-eq" ,rust-constant-time-eq-0.2)))) + ("rust-constant-time-eq" ,rust-constant-time-eq-0.3)))) (home-page "https://github.com/oconnor663/blake2_simd") (synopsis "Pure Rust BLAKE2b implementation with dynamic SIMD") (description @@ -901,14 +933,14 @@ and block modes.") (define-public rust-botan-0.10 (package (name "rust-botan") - (version "0.10.3") + (version "0.10.7") (source (origin (method url-fetch) (uri (crate-uri "botan" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1vzl5pdysh848zpphsgvj9c40zdi3ynl32zzixsd8vg4vaflhb49")))) + "0gn5aznnaxwlf2500q5dk9c24sgy7dasqqzql7w86s1w3apq201m")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -942,17 +974,17 @@ and block modes.") (define-public rust-botan-sys-0.10 (package (name "rust-botan-sys") - (version "0.10.3") + (version "0.10.5") (source (origin (method url-fetch) (uri (crate-uri "botan-sys" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1cbjr44gc5dhmgl43sfiqzbsma4anfi3h26m4yzsli23yd1lmyf8")))) + "1ji12rxvi4h7pap772cd2hw4xdgqdsgw6m8wqin9klpbp3hxsjcz")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs (("rust-botan-src" ,rust-botan-src-0.21903)))) + `(#:cargo-inputs (("rust-botan-src" ,rust-botan-src-0.30101)))) (inputs (list botan)) (home-page "https://botan.randombit.net/") (synopsis "FFI wrapper for Botan cryptography library") @@ -975,20 +1007,20 @@ and block modes.") (("rust-botan-src" ,rust-botan-src-0.21703) ("rust-cty" ,rust-cty-0.2)))))) -(define-public rust-botan-src-0.21903 +(define-public rust-botan-src-0.30101 (package (name "rust-botan-src") - (version "0.21903.1") - (source (origin - (method url-fetch) - (uri (crate-uri "botan-src" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "19fhll4g0v8hbyjxg8c790l9ln5xgf4r6xdcnw438mpy81hvrdxy")) - (modules '((guix build utils))) - (snippet - '(begin (delete-file-recursively "botan"))))) + (version "0.30101.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "botan-src" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "17xwnan8r21hzbxdailnidp9q54g787s9njhy63yqw83q0k09bxa")) + (modules '((guix build utils))) + (snippet + '(begin (delete-file-recursively "botan"))))) (build-system cargo-build-system) (arguments '(#:skip-build? #t)) (home-page "https://botan.randombit.net/") @@ -998,7 +1030,7 @@ and block modes.") (define-public rust-botan-src-0.21703 (package - (inherit rust-botan-src-0.21903) + (inherit rust-botan-src-0.30101) (name "rust-botan-src") (version "0.21703.0") (source (origin @@ -1041,6 +1073,27 @@ and block modes.") "The ChaCha family of stream ciphers.") (license (list license:asl2.0 license:expat)))) +(define-public rust-camellia-0.1 + (package + (name "rust-camellia") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "camellia" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0c6f61rf0gzq7x9d2qmp0330pb397aldwdpmwqybbwly9rby4r1j")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-byteorder" ,rust-byteorder-1) + ("rust-cipher" ,rust-cipher-0.4)) + #:cargo-development-inputs (("rust-cipher" ,rust-cipher-0.4)))) + (home-page "https://github.com/RustCrypto/block-ciphers") + (synopsis "Camellia block cipher") + (description "This package provides the camellia block cipher.") + (license (list license:expat license:asl2.0)))) + (define-public rust-cast5-0.11 (package (name "rust-cast5") @@ -1168,8 +1221,64 @@ XChaCha20, XChaCha12 and XChaCha8 stream ciphers, and also optional (("rust-cipher" ,rust-cipher-0.3) ("rust-hex-literal" ,rust-hex-literal-0.2)))))) +(define-public rust-chacha20-0.7 + (package + (inherit rust-chacha20-0.9) + (name "rust-chacha20") + (version "0.7.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "chacha20" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1c8h4sp9zh13v8p9arydjcj92xc6j3mccrjc4mizrvq7fzx9717h")) + (modules '((guix build utils))) + (snippet + '(begin + (substitute* "Cargo.toml" + (("version = \">=1, <1.4\"") "version = \"^1\"")))))) + (arguments + `(#:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-1) + ("rust-cipher" ,rust-cipher-0.3) + ("rust-cpufeatures" ,rust-cpufeatures-0.2) + ("rust-rand-core" ,rust-rand-core-0.6) + ("rust-zeroize" ,rust-zeroize-1)) + #:cargo-development-inputs (("rust-cipher" ,rust-cipher-0.3) + ("rust-hex-literal" ,rust-hex-literal-0.2)))))) + +(define-public rust-chacha20poly1305-0.10 + (package + (name "rust-chacha20poly1305") + (version "0.10.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "chacha20poly1305" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0dfwq9ag7x7lnd0znafpcn8h7k4nfr9gkzm0w7sc1lcj451pkk8h")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-aead" ,rust-aead-0.5) + ("rust-chacha20" ,rust-chacha20-0.9) + ("rust-cipher" ,rust-cipher-0.4) + ("rust-poly1305" ,rust-poly1305-0.8) + ("rust-zeroize" ,rust-zeroize-1)) + #:cargo-development-inputs (("rust-aead" ,rust-aead-0.5)))) + (home-page "https://github.com/RustCrypto/AEADs/tree/master/chacha20poly1305") + (synopsis "Rust implementation of ChaCha20Poly1305 Authenticated Encryption") + (description + "Pure Rust implementation of the ChaCha20Poly1305 Authenticated Encryption +with Additional Data Cipher (RFC 8439) with optional architecture-specific +hardware acceleration. Also contains implementations of the XChaCha20Poly1305 +extended nonce variant of ChaCha20Poly1305, and the reduced-round +ChaCha8Poly1305 and ChaCha12Poly1305 lightweight variants.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-chacha20poly1305-0.9 (package + (inherit rust-chacha20poly1305-0.10) (name "rust-chacha20poly1305") (version "0.9.1") (source @@ -1184,7 +1293,6 @@ XChaCha20, XChaCha12 and XChaCha8 stream ciphers, and also optional '(begin (substitute* "Cargo.toml" (("version = \">=1, <1.5\"") "version = \"^1\"")))))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-aead" ,rust-aead-0.4) @@ -1193,17 +1301,32 @@ XChaCha20, XChaCha12 and XChaCha8 stream ciphers, and also optional ("rust-poly1305" ,rust-poly1305-0.7) ("rust-zeroize" ,rust-zeroize-1)) #:cargo-development-inputs - (("rust-aead" ,rust-aead-0.4)))) - (home-page "https://github.com/RustCrypto/AEADs/tree/master/chacha20poly1305") - (synopsis - "Pure Rust implementation of ChaCha20Poly1305 Authenticated Encryption") - (description - "Pure Rust implementation of the ChaCha20Poly1305 Authenticated -Encryption with Additional Data Cipher (RFC 8439) with optional -architecture-specific hardware acceleration. Also contains implementations of -the XChaCha20Poly1305 extended nonce variant of ChaCha20Poly1305, and the -reduced-round ChaCha8Poly1305 and ChaCha12Poly1305 lightweight variants.") - (license (list license:asl2.0 license:expat)))) + (("rust-aead" ,rust-aead-0.4)))))) + +(define-public rust-chacha20poly1305-0.8 + (package + (inherit rust-chacha20poly1305-0.10) + (name "rust-chacha20poly1305") + (version "0.8.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "chacha20poly1305" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "18mb6k1w71dqv5q50an4rvp19l6yg8ssmvfrmknjfh2z0az7lm5n")) + (modules '((guix build utils))) + (snippet + '(begin + (substitute* "Cargo.toml" + (("version = \">=1, <1.4\"") "version = \"^1\"")))))) + (arguments + `(#:cargo-inputs (("rust-aead" ,rust-aead-0.4) + ("rust-chacha20" ,rust-chacha20-0.7) + ("rust-cipher" ,rust-cipher-0.3) + ("rust-poly1305" ,rust-poly1305-0.7) + ("rust-zeroize" ,rust-zeroize-1)) + #:cargo-development-inputs (("rust-aead" ,rust-aead-0.4)))))) (define-public rust-cipher-0.4 (package @@ -1622,6 +1745,36 @@ algorithms.") hash functions.") (license license:expat))) +(define-public rust-csrf-0.4 + (package + (name "rust-csrf") + (version "0.4.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "csrf" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1q7ixhshj6a7x2vgsr4d4iqa5mgp4fwkr4lx2hgvnj9xcy1py9dh")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-aead" ,rust-aead-0.4) + ("rust-aes-gcm" ,rust-aes-gcm-0.9) + ("rust-byteorder" ,rust-byteorder-1) + ("rust-chacha20poly1305" ,rust-chacha20poly1305-0.8) + ("rust-chrono" ,rust-chrono-0.4) + ("rust-data-encoding" ,rust-data-encoding-2) + ("rust-generic-array" ,rust-generic-array-0.14) + ("rust-hmac" ,rust-hmac-0.11) + ("rust-log" ,rust-log-0.4) + ("rust-rand" ,rust-rand-0.8) + ("rust-sha2" ,rust-sha2-0.9) + ("rust-typemap" ,rust-typemap-0.3)))) + (home-page "https://github.com/heartsucker/rust-csrf") + (synopsis "CSRF protection primitives") + (description "This package provides CSRF protection primitives.") + (license license:expat))) + (define-public rust-ctr-0.9 (package (name "rust-ctr") @@ -1685,8 +1838,49 @@ re-exported cipher crate.") `(#:skip-build? #t #:cargo-inputs (("rust-cipher" ,rust-cipher-0.2)))))) +(define-public rust-curve25519-dalek-4 + (package + (name "rust-curve25519-dalek") + (version "4.1.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "curve25519-dalek" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0j7kqchcgycs4a11gvlda93h9w2jr05nn4hjpfyh2kn94a4pnrqa")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-cfg-if" ,rust-cfg-if-1) + ("rust-cpufeatures" ,rust-cpufeatures-0.2) + ("rust-curve25519-dalek-derive" ,rust-curve25519-dalek-derive-0.1) + ("rust-digest" ,rust-digest-0.10) + ("rust-ff" ,rust-ff-0.13) + ("rust-fiat-crypto" ,rust-fiat-crypto-0.2) + ("rust-group" ,rust-group-0.13) + ("rust-platforms" ,rust-platforms-3) + ("rust-rand-core" ,rust-rand-core-0.6) + ("rust-rustc-version" ,rust-rustc-version-0.4) + ("rust-serde" ,rust-serde-1) + ("rust-subtle" ,rust-subtle-2) + ("rust-zeroize" ,rust-zeroize-1)) + #:cargo-development-inputs (("rust-bincode" ,rust-bincode-1) + ("rust-criterion" ,rust-criterion-0.5) + ("rust-hex" ,rust-hex-0.4) + ("rust-rand" ,rust-rand-0.8) + ("rust-rand-core" ,rust-rand-core-0.6) + ("rust-sha2" ,rust-sha2-0.10)))) + (home-page "https://doc.dalek.rs/curve25519_dalek") + (synopsis "Group operations on ristretto255 and Curve25519") + (description + "This package provides a pure-Rust implementation of group operations +on ristretto255 and Curve25519.") + (license license:bsd-3))) + (define-public rust-curve25519-dalek-3 (package + (inherit rust-curve25519-dalek-4) (name "rust-curve25519-dalek") (version "3.2.0") (source @@ -1696,7 +1890,6 @@ re-exported cipher crate.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "0q8v97275cy6v4ly6y2qwv9a8phnpjg9sy8kv7r6mgdjfacxz7qb")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-byteorder" ,rust-byteorder-1) @@ -1712,13 +1905,28 @@ re-exported cipher crate.") ("rust-criterion" ,rust-criterion-0.3) ("rust-hex" ,rust-hex-0.4) ("rust-rand" ,rust-rand-0.7) - ("rust-sha2" ,rust-sha2-0.9)))) - (home-page "https://dalek.rs/curve25519-dalek") - (synopsis "Group operations on ristretto255 and Curve25519") - (description - "This package provides a pure-Rust implementation of group operations on -ristretto255 and Curve25519.") - (license license:bsd-3))) + ("rust-sha2" ,rust-sha2-0.9)))))) + +(define-public rust-curve25519-dalek-derive-0.1 + (package + (name "rust-curve25519-dalek-derive") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "curve25519-dalek-derive" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1cry71xxrr0mcy5my3fb502cwfxy6822k4pm19cwrilrg7hq4s7l")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-2)))) + (home-page "https://doc.dalek.rs/curve25519_dalek") + (synopsis "curve25519-dalek Derives") + (description "This package provides curve25519-dalek Derives.") + (license (list license:expat license:asl2.0)))) (define-public rust-curve25519-dalek-ng-4 (package @@ -1882,8 +2090,9 @@ ciphers implementations.") (define-public rust-digest-0.6 (package + (inherit rust-digest-0.10) (name "rust-digest") - (version "0.6.2") + (version "0.6.1") (source (origin (method url-fetch) @@ -1891,16 +2100,45 @@ ciphers implementations.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "02mgf8z4hi96w9nl2zb5w3k6lqbhjgv5z8hhyv2b7x7kavqrpcp5")))) - (build-system cargo-build-system) + "1lgv5rs7i903zvmkdbil0bcjx9vxvi9rx4z9qavapz199q31rbpc")))) (arguments `(#:cargo-inputs - (("rust-generic-array" ,rust-generic-array-0.8)))) - (home-page "https://github.com/RustCrypto/traits") - (synopsis "Traits for cryptographic hash functions") - (description "This package provides traits for cryptographic hash -functions.") - (license (list license:expat license:asl2.0)))) + (("rust-generic-array" ,rust-generic-array-0.8)))))) + +(define-public rust-dsa-0.6 + (package + (name "rust-dsa") + (version "0.6.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "dsa" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "12bn5d0nnni4mlla24m3bwi4mhy2nfmyak2qjl0pdbc4j1525g28")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-digest" ,rust-digest-0.10) + ("rust-num-bigint-dig" ,rust-num-bigint-dig-0.8) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-pkcs8" ,rust-pkcs8-0.10) + ("rust-rfc6979" ,rust-rfc6979-0.4) + ("rust-sha2" ,rust-sha2-0.10) + ("rust-signature" ,rust-signature-2) + ("rust-zeroize" ,rust-zeroize-1)) + #:cargo-development-inputs (("rust-pkcs8" ,rust-pkcs8-0.10) + ("rust-rand" ,rust-rand-0.8) + ("rust-rand-chacha" ,rust-rand-chacha-0.3) + ("rust-sha1" ,rust-sha1-0.10)))) + (home-page "https://github.com/RustCrypto/signatures/tree/master/dsa") + (synopsis + "Rust implementation of the Digital Signature Algorithm (DSA)") + (description + "This package provides a pure Rust implementation of the @acronym{Digital +Signature Algorithm, DSA} as specified in FIPS 186-4 (Digital Signature +Standard), providing RFC6979 deterministic signatures as well as support for +added entropy.") + (license (list license:asl2.0 license:expat)))) (define-public rust-eax-0.5 (package @@ -1938,14 +2176,14 @@ same thing).") (define-public rust-ecdsa-0.16 (package (name "rust-ecdsa") - (version "0.16.6") + (version "0.16.9") (source (origin (method url-fetch) (uri (crate-uri "ecdsa" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1zapr75j8w1b7bdnijppb94f2jrk2qdrhv8i4fqc0c4agd9mv3m4")))) + "1jhb0bcbkaz4001sdmfyv8ajrv8a1cg7z7aa5myrd4jjbhmz69zf")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -1955,7 +2193,8 @@ same thing).") ("rust-rfc6979" ,rust-rfc6979-0.4) ("rust-serdect" ,rust-serdect-0.2) ("rust-sha2" ,rust-sha2-0.10) - ("rust-signature" ,rust-signature-2)) + ("rust-signature" ,rust-signature-2) + ("rust-spki" ,rust-spki-0.7)) #:cargo-development-inputs (("rust-elliptic-curve" ,rust-elliptic-curve-0.13) ("rust-hex-literal" ,rust-hex-literal-0.4) @@ -2024,8 +2263,47 @@ support for added entropy.") "ECIES on Twisted Edwards Curve25519 using AES-GCM and HKDF-SHA256.") (license (list license:expat license:asl2.0)))) +(define-public rust-ed25519-2 + (package + (name "rust-ed25519") + (version "2.2.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "ed25519" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0lydzdf26zbn82g7xfczcac9d7mzm3qgx934ijjrd5hjpjx32m8i")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-pkcs8" ,rust-pkcs8-0.10) + ("rust-serde" ,rust-serde-1) + ("rust-serde-bytes" ,rust-serde-bytes-0.11) + ("rust-signature" ,rust-signature-2) + ("rust-zeroize" ,rust-zeroize-1)) + #:cargo-development-inputs + (("rust-bincode" ,rust-bincode-1) + ("rust-ed25519-dalek" ,rust-ed25519-dalek-2) + ("rust-hex-literal" ,rust-hex-literal-0.4) + ("rust-rand-core" ,rust-rand-core-0.6) + ("rust-ring-compat" ,rust-ring-compat-0.8)))) + (home-page "https://github.com/RustCrypto/signatures/tree/master/ed25519") + (synopsis "Edwards Digital Signature Algorithm over Curve25519") + (description + "EdDSA over Curve25519 is specified in RFC 8032. This package +contains an ed25519::Signature type which other packages can use in +conjunction with the signature::Signer and signature::Verifier traits. +It doesn't contain an implementation of Ed25519. + +These traits allow packages which produce and consume Ed25519 signatures +to be written abstractly in such a way that different signer/verifier +providers can be plugged in, enabling support for using different Ed25519 +implementations, including HSMs or Cloud KMS services.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-ed25519-1 (package + (inherit rust-ed25519-2) (name "rust-ed25519") (version "1.5.3") (source (origin @@ -2047,20 +2325,7 @@ support for added entropy.") (("rust-bincode" ,rust-bincode-1) ("rust-ed25519-dalek" ,rust-ed25519-dalek-1) ("rust-hex-literal" ,rust-hex-literal-0.3) - ("rust-rand-core" ,rust-rand-core-0.5)))) - (home-page "https://github.com/RustCrypto/signatures/tree/master/ed25519") - (synopsis "Edwards Digital Signature Algorithm (EdDSA) over Curve25519") - (description - "EdDSA over Curve25519 is specified in RFC 8032. This package contains -an ed25519::Signature type which other packages can use in conjunction with -the signature::Signer and signature::Verifier traits It doesn't contain an -implementation of Ed25519. - -These traits allow packages which produce and consume Ed25519 signatures to be -written abstractly in such a way that different signer/verifier providers can -be plugged in, enabling support for using different Ed25519 implementations, -including HSMs or Cloud KMS services.") - (license (list license:asl2.0 license:expat)))) + ("rust-rand-core" ,rust-rand-core-0.5)))))) (define-public rust-ed25519-compact-2 (package @@ -2089,8 +2354,57 @@ including HSMs or Cloud KMS services.") implementation.") (license license:expat))) +(define-public rust-ed25519-dalek-2 + (package + (name "rust-ed25519-dalek") + (version "2.1.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "ed25519-dalek" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0w88cafwglg9hjizldbmlza0ns3hls81zk1bcih3m5m3h67algaa")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-test-flags '("--release" "--" + ;; Some tests aren't shipped in the crate. + "--skip=vectors::against_reference_implementation" + "--skip=check_validation_criteria" + "--skip=find_validation_criteria") + #:cargo-inputs (("rust-curve25519-dalek" ,rust-curve25519-dalek-4) + ("rust-ed25519" ,rust-ed25519-2) + ("rust-merlin" ,rust-merlin-3) + ("rust-rand-core" ,rust-rand-core-0.6) + ("rust-serde" ,rust-serde-1) + ("rust-sha2" ,rust-sha2-0.10) + ("rust-signature" ,rust-signature-2) + ("rust-subtle" ,rust-subtle-2) + ("rust-zeroize" ,rust-zeroize-1)) + #:cargo-development-inputs + (("rust-bincode" ,rust-bincode-1) + ("rust-blake2" ,rust-blake2-0.10) + ("rust-criterion" ,rust-criterion-0.5) + ("rust-curve25519-dalek" ,rust-curve25519-dalek-4) + ("rust-hex" ,rust-hex-0.4) + ("rust-hex-literal" ,rust-hex-literal-0.4) + ("rust-rand" ,rust-rand-0.8) + ("rust-rand-core" ,rust-rand-core-0.6) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-sha3" ,rust-sha3-0.10) + ("rust-toml" ,rust-toml-0.7) + ("rust-x25519-dalek" ,rust-x25519-dalek-2)))) + (home-page "https:///doc.dalek.rs/ed25519_dalek") + (synopsis "Ed25519 EdDSA key generations, signing, and verification") + (description + "This package provides fast and efficient ed25519 @code{EdDSA} key +generations, signing, and verification in pure Rust.") + (license license:bsd-3))) + (define-public rust-ed25519-dalek-1 (package + (inherit rust-ed25519-dalek-2) (name "rust-ed25519-dalek") (version "1.0.1") (source @@ -2112,25 +2426,20 @@ implementation.") ("rust-serde" ,rust-serde-1) ("rust-serde-bytes" ,rust-serde-bytes-0.11) ("rust-sha2" ,rust-sha2-0.9) - ("rust-zeroize" ,rust-zeroize-1)))) - (home-page "https://dalek.rs") - (synopsis "Ed25519 EdDSA key generations, signing, and verification") - (description - "This package provides fast and efficient ed25519 EdDSA key generations, -signing, and verification in pure Rust.") - (license license:bsd-3))) + ("rust-zeroize" ,rust-zeroize-1)))))) + (define-public rust-elliptic-curve-0.13 (package (name "rust-elliptic-curve") - (version "0.13.4") + (version "0.13.8") (source (origin (method url-fetch) (uri (crate-uri "elliptic-curve" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1rqn7yq9rgfs7r0dcj4phxf9hqmw2alfxa0lciamsbkz6sm1xivm")))) + "0ixx4brgnzi61z29r3g1606nh2za88hzyz8c5r3p6ydzhqq09rmm")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -2150,6 +2459,7 @@ signing, and verification in pure Rust.") ("rust-serde-json" ,rust-serde-json-1) ("rust-serdect" ,rust-serdect-0.2) ("rust-subtle" ,rust-subtle-2) + ("rust-tap" ,rust-tap-1) ("rust-zeroize" ,rust-zeroize-1)) #:cargo-development-inputs (("rust-hex-literal" ,rust-hex-literal-0.4) @@ -2199,6 +2509,38 @@ curve forms, scalars, points, and public/secret keys composed thereof.") ("rust-sha2" ,rust-sha2-0.10) ("rust-sha3" ,rust-sha3-0.10)))))) +(define-public rust-fiat-crypto-0.2 + (package + (name "rust-fiat-crypto") + (version "0.2.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "fiat-crypto" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "10hkkkjynhibvchznkxx81gwxqarn9i5sgz40d6xxb8xzhsz8xhn")))) + (build-system cargo-build-system) + (home-page "https://github.com/mit-plv/fiat-crypto") + (synopsis "Fiat-crypto generated Rust") + (description "This crate provides the extracted Rust code from the Coq +@code{fiat-crypto} libraries.") + (license (list license:expat license:asl2.0 license:bsd-1)))) + +(define-public rust-fiat-crypto-0.1 + (package + (inherit rust-fiat-crypto-0.2) + (name "rust-fiat-crypto") + (version "0.1.20") + (source + (origin + (method url-fetch) + (uri (crate-uri "fiat-crypto" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0xvbcg6wh42q3n7294mzq5xxw8fpqsgc0d69dvm5srh1f6cgc9g8")))))) + (define-public rust-ghash-0.5 (package (name "rust-ghash") @@ -2225,6 +2567,31 @@ for constructing a Message Authentication Code (MAC), as in the AES-GCM authenticated encryption cipher.") (license (list license:expat license:asl2.0)))) +(define-public rust-ghash-0.4 + (package + (inherit rust-ghash-0.5) + (name "rust-ghash") + (version "0.4.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "ghash" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "169wvrc2k9lw776x3pmqp76kc0w5717wz01bfg9rz0ypaqbcr0qm")) + (modules '((guix build utils))) + (snippet + '(begin (substitute* "Cargo.toml" + (((string-append ">=([[:digit:]]+(\\.[[:digit:]]+)*)," + " <([[:digit:]]+(\\.[[:digit:]]+)*)") + _ version _) + (string-append ">=" version))))))) + (arguments + `(#:cargo-inputs (("rust-opaque-debug" ,rust-opaque-debug-0.3) + ("rust-polyval" ,rust-polyval-0.5) + ("rust-zeroize" ,rust-zeroize-1)) + #:cargo-development-inputs (("rust-hex-literal" ,rust-hex-literal-0.3)))))) + (define-public rust-ghash-0.3 (package (inherit rust-ghash-0.5) @@ -2520,6 +2887,48 @@ Hash-based Message Authentication Code}.") Hash-based Message Authentication Code algorithm} for SHA1.") (license license:bsd-3))) +(define-public rust-k256-0.13 + (package + (name "rust-k256") + (version "0.13.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "k256" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0ysq18pjz040am5llgly90464x7qqq98yxfbcsladq96gsvgjvwm")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-1) + ("rust-ecdsa" ,rust-ecdsa-0.16) + ("rust-elliptic-curve" ,rust-elliptic-curve-0.13) + ("rust-hex-literal" ,rust-hex-literal-0.4) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-serdect" ,rust-serdect-0.2) + ("rust-sha2" ,rust-sha2-0.10) + ("rust-signature" ,rust-signature-2)) + #:cargo-development-inputs (("rust-blobby" ,rust-blobby-0.3) + ("rust-criterion" ,rust-criterion-0.5) + ("rust-ecdsa" ,rust-ecdsa-0.16) + ("rust-hex-literal" ,rust-hex-literal-0.4) + ("rust-num-bigint" ,rust-num-bigint-0.4) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-proptest" ,rust-proptest-1) + ("rust-rand-core" ,rust-rand-core-0.6) + ("rust-sha3" ,rust-sha3-0.10)))) + (home-page + "https://github.com/RustCrypto/elliptic-curves/tree/master/k256") + (synopsis + "Library supporting general-purpose elliptic curve group operations") + (description + "This package provides a secp256k1 elliptic curve library written in pure +Rust with support for ECDSA signing/verification/public-key recovery, +@dfn{Taproot Schnorr signatures} (BIP340), @dfn{Elliptic Curve Diffie-Hellman} +(ECDH), and general-purpose secp256k1 elliptic curve group operations which can +be used to implement arbitrary protocols.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-kuznyechik-0.8 (package (name "rust-kuznyechik") @@ -2542,23 +2951,69 @@ Hash-based Message Authentication Code algorithm} for SHA1.") (description "Kuznyechik (GOST R 34.12-2015) block cipher") (license (list license:expat license:asl2.0)))) +(define-public rust-mas-jose-0.7 + (package + (name "rust-mas-jose") + (version "0.7.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "mas-jose" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0x1cikddf2z3994374ql0qs02l9mxrlb74cy4pbq3yrlzcfjb6mk")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-base64ct" ,rust-base64ct-1) + ("rust-chrono" ,rust-chrono-0.4) + ("rust-digest" ,rust-digest-0.10) + ("rust-ecdsa" ,rust-ecdsa-0.16) + ("rust-elliptic-curve" ,rust-elliptic-curve-0.13) + ("rust-generic-array" ,rust-generic-array-0.14) + ("rust-hmac" ,rust-hmac-0.12) + ("rust-k256" ,rust-k256-0.13) + ("rust-mas-iana" ,rust-mas-iana-0.7) + ("rust-p256" ,rust-p256-0.13) + ("rust-p384" ,rust-p384-0.13) + ("rust-rand" ,rust-rand-0.8) + ("rust-rsa" ,rust-rsa-0.9) + ("rust-schemars" ,rust-schemars-0.8) + ("rust-sec1" ,rust-sec1-0.7) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-serde-with" ,rust-serde-with-3) + ("rust-sha2" ,rust-sha2-0.10) + ("rust-signature" ,rust-signature-2) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-tracing" ,rust-tracing-0.1) + ("rust-url" ,rust-url-2)) + #:cargo-development-inputs + (("rust-insta" ,rust-insta-1) + ("rust-rand-chacha" ,rust-rand-chacha-0.3)))) + (home-page "https://matrix-org.github.io/matrix-authentication-service/") + (synopsis "JSON Object Signing and Encryption (JWT & co.) utilities") + (description "This package provides JSON Object Signing and Encryption +(JWT & co.) utilities.") + (license license:asl2.0))) + (define-public rust-md-5-0.10 (package (name "rust-md-5") - (version "0.10.5") + (version "0.10.6") (source (origin (method url-fetch) (uri (crate-uri "md-5" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1jmrykh705dfclkgxwjysj5y8l1nyrn1gddw5xpgyjyla1l50rb3")))) + "1kvq5rnpm4fzwmyv5nmnxygdhhb2369888a06gdc9pxyrzh7x7nq")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-digest" ,rust-digest-0.10) - ("rust-md5-asm" ,rust-md5-asm-0.5)))) + `(#:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-1) + ("rust-digest" ,rust-digest-0.10) + ("rust-md5-asm" ,rust-md5-asm-0.5)) + #:cargo-development-inputs (("rust-digest" ,rust-digest-0.10) + ("rust-hex-literal" ,rust-hex-literal-0.2)))) (home-page "https://github.com/RustCrypto/hashes") (synopsis "MD5 hash function") (description @@ -2786,25 +3241,25 @@ cryptographic library.") (define-public rust-orion-0.17 (package (name "rust-orion") - (version "0.17.4") + (version "0.17.6") (source (origin (method url-fetch) (uri (crate-uri "orion" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0ri0b0vyd9vqwlzlcv0q4i7r9pga23q7nnnvd5z4zycjc9v4mryb")))) + "1rcm8vgzb1rvm1ilgak1lkia3wasdmnmv93b055qqg4hh40v3gbs")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-ct-codecs" ,rust-ct-codecs-1) - ("rust-fiat-crypto" ,rust-fiat-crypto-0.1) + ("rust-fiat-crypto" ,rust-fiat-crypto-0.2) ("rust-getrandom" ,rust-getrandom-0.2) ("rust-serde" ,rust-serde-1) ("rust-subtle" ,rust-subtle-2) ("rust-zeroize" ,rust-zeroize-1)) #:cargo-development-inputs - (("rust-criterion" ,rust-criterion-0.4) + (("rust-criterion" ,rust-criterion-0.5) ("rust-hex" ,rust-hex-0.4) ("rust-quickcheck" ,rust-quickcheck-1) ("rust-quickcheck-macros" ,rust-quickcheck-macros-1) @@ -3213,6 +3668,34 @@ Standards (PKCS) #5: Password-Based Cryptography Specification Version ("rust-sha2" ,rust-sha2-0.9) ("rust-spki" ,rust-spki-0.4)))))) +(define-public rust-pkcs7-0.4 + (package + (name "rust-pkcs7") + (version "0.4.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "pkcs7" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1rvp9gm7vzcbbzz6vr6xz6ri2szgxm35j0zk5dhf01b40sz7i4fp")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-der" ,rust-der-0.7) + ("rust-spki" ,rust-spki-0.7) + ("rust-x509-cert" ,rust-x509-cert-0.2)) + #:cargo-development-inputs + (("rust-der" ,rust-der-0.7) + ("rust-hex-literal" ,rust-hex-literal-0.4) + ("rust-x509-cert" ,rust-x509-cert-0.2)))) + (home-page "https://github.com/RustCrypto/formats/tree/master/pkcs7") + (synopsis "Implementation of Public-Key Cryptography Standards (PKCS) #7") + (description + "This package is a pure Rust implementation of Public-Key +Cryptography Standards (PKCS) #7: Cryptographic Message Syntax +Specification (RFC 5652).") + (license (list license:asl2.0 license:expat)))) + (define-public rust-pkcs8-0.10 (package (name "rust-pkcs8") @@ -3378,8 +3861,7 @@ implementation suitable for use with cryptographic private keys.") (sha256 (base32 "1m1c9jypydzabg4yscplmvff7pdcc8gg4cqg081hnlf03hxkmsc4")))) (arguments - `(#:skip-build? #t - #:cargo-inputs (("rust-base64ct" ,rust-base64ct-1)))))) + `(#:cargo-inputs (("rust-base64ct" ,rust-base64ct-1.1)))))) (define-public rust-poly1305-0.8 (package @@ -3458,6 +3940,33 @@ a cipher, can be used as a Message Authentication Code (MAC).") for constructing a Message Authentication Code (MAC).") (license (list license:asl2.0 license:expat)))) +(define-public rust-polyval-0.5 + (package + (inherit rust-polyval-0.6) + (name "rust-polyval") + (version "0.5.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "polyval" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1890wqvc0csc9y9k9k4gsbz91rgdnhn6xnfmy9pqkh674fvd46c4")) + (modules '((guix build utils))) + (snippet + '(begin (substitute* "Cargo.toml" + (((string-append ">=([[:digit:]]+(\\.[[:digit:]]+)*)," + " <([[:digit:]]+(\\.[[:digit:]]+)*)") + _ version _) + (string-append ">=" version))))))) + (arguments + `(#:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-1) + ("rust-cpufeatures" ,rust-cpufeatures-0.2) + ("rust-opaque-debug" ,rust-opaque-debug-0.3) + ("rust-universal-hash" ,rust-universal-hash-0.4) + ("rust-zeroize" ,rust-zeroize-1)) + #:cargo-development-inputs (("rust-hex-literal" ,rust-hex-literal-0.3)))))) + (define-public rust-polyval-0.4 (package (inherit rust-polyval-0.6) @@ -3501,7 +4010,7 @@ for constructing a Message Authentication Code (MAC).") (define-public rust-ppv-lite86-0.2 (package (name "rust-ppv-lite86") - (version "0.2.8") + (version "0.2.17") (source (origin (method url-fetch) @@ -3509,7 +4018,7 @@ for constructing a Message Authentication Code (MAC).") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1shj4q7jwj0azssr8cg51dk3kh7d4lg9rmbbz1kbqk971vc5wyi3")))) + "1pp6g52aw970adv3x2310n7glqnji96z0a9wiamzw89ibf0ayh2v")))) (build-system cargo-build-system) (home-page "https://github.com/cryptocorrosion/cryptocorrosion") (synopsis "Implementation of the crypto-simd API for x86") @@ -3590,16 +4099,16 @@ Digital Signature Algorithm} (ECDSA).") (define computed-origin-method (@@ (guix packages) computed-origin-method)) (define rust-ring-0.17-sources - (let* ((version "0.17.7") + (let* ((version "0.17.8") (upstream-source (origin (method git-fetch) (uri (git-reference (url "https://github.com/briansmith/ring") - (commit "2be687bebdf76648ce85109d40c015412e14b0da"))) + (commit "fa98b490bcbc99a01ff150896ec74c1813242d7f"))) (file-name (git-file-name "rust-ring" version)) (sha256 - (base32 "1i3b7sha8yj990v2s5yk2a5dx3v4x9b8ckzm6bgiyi6wk4vnid69")) + (base32 "0rqfal81bf4l3dja98cajfjq2jbz1rcx7xdp2r33cxrm5y5psr28")) (patches (search-patches "rust-ring-0.17-ring-core.patch"))))) (origin (method computed-origin-method) @@ -3680,6 +4189,7 @@ Digital Signature Algorithm} (ECDSA).") "crypto/fipsmodule/bn/asm/armv8-mont.pl" "crypto/fipsmodule/ec/asm/p256-armv8-asm.pl" "crypto/fipsmodule/modes/asm/ghash-neon-armv8.pl" + "crypto/fipsmodule/modes/asm/aesv8-gcm-armv8.pl" "crypto/fipsmodule/sha/asm/sha512-armv8.pl")) (for-each @@ -3779,16 +4289,17 @@ Digital Signature Algorithm} (ECDSA).") (define-public rust-ring-0.17 (package (name "rust-ring") - (version "0.17.7") + (version "0.17.8") (source rust-ring-0.17-sources) (build-system cargo-build-system) (arguments - `(#:cargo-inputs (("rust-cc" ,rust-cc-1) + `(#:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-1) + ("rust-cc" ,rust-cc-1) ("rust-getrandom" ,rust-getrandom-0.2) ("rust-libc" ,rust-libc-0.2) ("rust-spin" ,rust-spin-0.9) ("rust-untrusted" ,rust-untrusted-0.9) - ("rust-windows-sys" ,rust-windows-sys-0.48)) + ("rust-windows-sys" ,rust-windows-sys-0.52)) #:cargo-development-inputs (("rust-libc" ,rust-libc-0.2) ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3)))) @@ -4408,6 +4919,40 @@ Digital Signature Algorithm} (ECDSA).") ;; build dependencies ("rust-cc" ,rust-cc-1)))))) +(define-public rust-ring-compat-0.8 + (package + (name "rust-ring-compat") + (version "0.8.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "ring-compat" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1m2vvmbg607f55afx75b9kxbyx6b5wqvhhfv2445z08b2np7pknc")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-aead" ,rust-aead-0.5) + ("rust-digest" ,rust-digest-0.10) + ("rust-ecdsa" ,rust-ecdsa-0.16) + ("rust-ed25519" ,rust-ed25519-2) + ("rust-generic-array" ,rust-generic-array-0.14) + ("rust-p256" ,rust-p256-0.13) + ("rust-p384" ,rust-p384-0.13) + ("rust-pkcs8" ,rust-pkcs8-0.10) + ("rust-rand-core" ,rust-rand-core-0.6) + ("rust-ring" ,rust-ring-0.17) + ("rust-signature" ,rust-signature-2)) + #:cargo-development-inputs + (("rust-digest" ,rust-digest-0.10) + ("rust-hex-literal" ,rust-hex-literal-0.4)))) + (home-page "https://github.com/RustCrypto/ring-compat") + (synopsis "RustCrypto trait and ring crypto algorithm compatibility") + (description + "This package provides compatibility for using @code{RustCrypto} +traits with cryptographic algorithm implementations from @code{ring}.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-ripemd-0.1 (package (name "rust-ripemd") @@ -4738,14 +5283,14 @@ function.") (define-public rust-sec1-0.7 (package (name "rust-sec1") - (version "0.7.2") + (version "0.7.3") (source (origin (method url-fetch) (uri (crate-uri "sec1" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0vh4pvdfnghbjglh6k74vs93jj337jpli28bbyqr0srxh67c9bph")))) + "1p273j8c87pid6a1iyyc7vxbvifrw55wbxgr0dh3l8vnbxb7msfk")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -4757,7 +5302,7 @@ function.") ("rust-subtle" ,rust-subtle-2) ("rust-zeroize" ,rust-zeroize-1)) #:cargo-development-inputs - (("rust-hex-literal" ,rust-hex-literal-0.3) + (("rust-hex-literal" ,rust-hex-literal-0.4) ("rust-tempfile" ,rust-tempfile-3)))) (home-page "https://github.com/RustCrypto/formats/tree/master/sec1") (synopsis @@ -5121,8 +5666,41 @@ for data that potentially contains secrets (e.g. cryptographic keys).") SHA1 for Rust.") (license license:bsd-3))) +(define-public rust-sha1collisiondetection-0.3 + (package + (name "rust-sha1collisiondetection") + (version "0.3.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "sha1collisiondetection" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0jwnwrk1x78v9r16jnac2s4v1m2f5a19khwkx1vjh0d6whhn8q0z")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-clap" ,rust-clap-4) + ("rust-clap" ,rust-clap-4) + ("rust-clap-mangen" ,rust-clap-mangen-0.2) + ("rust-clap-mangen" ,rust-clap-mangen-0.2) + ("rust-const-oid" ,rust-const-oid-0.9) + ("rust-digest" ,rust-digest-0.10) + ("rust-generic-array" ,rust-generic-array-0.12)) + #:cargo-development-inputs (("rust-getrandom" ,rust-getrandom-0.2) + ("rust-hex-literal" ,rust-hex-literal-0.4) + ("rust-sha1" ,rust-sha1-0.10)))) + (home-page "https://gitlab.com/sequoia-pgp/sha1collisiondetection") + (synopsis "SHA-1 hash function with collision detection and mitigation") + (description + "This package implementation of the SHA-1 cryptographic hash algorithm. + +This is a port of Marc Stevens' sha1collisiondetection algorithm to Rust. The +code is translated from C to Rust using c2rust.") + (license license:expat))) + (define-public rust-sha1collisiondetection-0.2 (package + (inherit rust-sha1collisiondetection-0.3) (name "rust-sha1collisiondetection") (version "0.2.3") (source @@ -5133,7 +5711,6 @@ SHA1 for Rust.") (string-append name "-" version ".tar.gz")) (sha256 (base32 "10nh7s3d02136kkz93pxyfv628ls5xz8ndg27pkb6na0ghccz9np")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs @@ -5141,15 +5718,7 @@ SHA1 for Rust.") ("rust-generic-array" ,rust-generic-array-0.14) ("rust-libc" ,rust-libc-0.2) ("rust-sha-1" ,rust-sha-1-0.9) - ("rust-structopt" ,rust-structopt-0.3)))) - (home-page "https://docs.rs/sha1collisiondetection") - (synopsis "SHA-1 hash function with collision detection and mitigation") - (description - "This package implementation of the SHA-1 cryptographic hash algorithm. - -This is a port of Marc Stevens' sha1collisiondetection algorithm to Rust. The -code is translated from C to Rust using c2rust.") - (license license:expat))) + ("rust-structopt" ,rust-structopt-0.3)))))) (define-public rust-sha2-0.10 (package @@ -5263,6 +5832,32 @@ functions core functionality.") (sha256 (base32 "0y4n8r4362y2fa6p2j0dgny4zfi194gdf01l6j850n9vf8ha3kwj")))))) +(define-public rust-sha256-1 + (package + (name "rust-sha256") + (version "1.5.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "sha256" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1c35j1z4inpz7fwa6vy0xf3arffz5mykyj8nlc50g8sgj5m8y9qq")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-async-trait" ,rust-async-trait-0.1) + ("rust-bytes" ,rust-bytes-1) + ("rust-hex" ,rust-hex-0.4) + ("rust-openssl" ,rust-openssl-0.10) + ("rust-sha2" ,rust-sha2-0.10) + ("rust-tokio" ,rust-tokio-1)) + #:cargo-development-inputs (("rust-tokio" ,rust-tokio-1) + ("rust-tokio-test" ,rust-tokio-test-0.4)))) + (home-page "https://github.com/baoyachi/sha256-rs") + (synopsis "Sha256 crypto digest") + (description "This package provides the sha256 crypto digest in Rust.") + (license (list license:expat license:asl2.0)))) + (define-public rust-sha3-0.10 (package (name "rust-sha3") @@ -5313,14 +5908,14 @@ functions core functionality.") (define-public rust-signature-2 (package (name "rust-signature") - (version "2.1.0") + (version "2.2.0") (source (origin (method url-fetch) (uri (crate-uri "signature" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "00457czdia5gvll3a1vzf2ffsdpgcz2dz0h56z7zk28nsbp8h5sy")))) + "1pi9hd5vqfr3q3k49k37z06p7gs5si0in32qia4mmr1dancr6m3p")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -5328,7 +5923,7 @@ functions core functionality.") ("rust-rand-core" ,rust-rand-core-0.6) ("rust-signature-derive" ,rust-signature-derive-2)) #:cargo-development-inputs - (("rust-hex-literal" ,rust-hex-literal-0.3) + (("rust-hex-literal" ,rust-hex-literal-0.4) ("rust-sha2" ,rust-sha2-0.10)))) (home-page "https://github.com/RustCrypto/traits/tree/master/signature") (synopsis @@ -5360,14 +5955,14 @@ for generating and verifying digital signatures.") (define-public rust-signature-derive-2 (package (name "rust-signature-derive") - (version "2.0.1") + (version "2.1.0") (source (origin (method url-fetch) (uri (crate-uri "signature_derive" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1z0mjjg3fpj08kc3nkax4lczgp7sfzbcm8q2qgim865510wkgpxc")))) + "11h4z3bql9pzj0mf7bv30q9c3rldk9n03520pk3z9siyj78q20xb")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -5404,6 +5999,52 @@ for additional details.") ("rust-syn" ,rust-syn-1) ("rust-synstructure" ,rust-synstructure-0.12)))))) +(define-public rust-simple-asn1-0.4 + (package + (name "rust-simple-asn1") + (version "0.4.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "simple_asn1" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0jxy9as8nj65c2n27j843g4fpb95x4fjz31w6qx63q3wwlys2b39")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-chrono" ,rust-chrono-0.4) + ("rust-num-bigint" ,rust-num-bigint-0.2) + ("rust-num-traits" ,rust-num-traits-0.2)) + #:cargo-development-inputs (("rust-quickcheck" ,rust-quickcheck-0.7) + ("rust-rand" ,rust-rand-0.5)))) + (home-page "https://github.com/acw/simple_asn1") + (synopsis "Simple DER/ASN.1 encoding/decoding library") + (description + "This package provides a simple DER/ASN.1 encoding/decoding library.") + (license license:isc))) + +(define-public rust-sm3-0.4 + (package + (name "rust-sm3") + (version "0.4.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "sm3" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0q2qn4d7qhd8v5grr0xdq9jv3likcr2i8nnqqhxy79yh0avs7fgb")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-digest" ,rust-digest-0.10)) + #:cargo-development-inputs (("rust-digest" ,rust-digest-0.10) + ("rust-hex-literal" ,rust-hex-literal-0.2)))) + (home-page "https://github.com/RustCrypto/hashes") + (synopsis "SM3 (OSCCA GM/T 0004-2012) hash function") + (description + "This package provides the SM3 (OSCCA GM/T 0004-2012) hash function.") + (license (list license:expat license:asl2.0)))) + (define-public rust-spki-0.7 (package (name "rust-spki") @@ -5662,6 +6303,67 @@ cryptographic implementations.") "This package provides the Tiger cryptographic hash function.") (license (list license:expat license:asl2.0)))) +(define-public rust-tls-codec-0.4 + (package + (name "rust-tls-codec") + (version "0.4.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "tls_codec" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0spv5d8gjpmil4x14d8jk6wps59r4y7kdj77par8b30g6ff8rrxm")) + (modules '((guix build utils))) + (snippet + '(begin (substitute* "Cargo.toml" + (("\"= ?([[:digit:]]+(\\.[[:digit:]]+)*)" _ version) + (string-append "\"^" version))))))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-arbitrary" ,rust-arbitrary-1) + ("rust-serde" ,rust-serde-1) + ("rust-tls-codec-derive" ,rust-tls-codec-derive-0.4) + ("rust-zeroize" ,rust-zeroize-1)) + #:cargo-development-inputs + (("rust-anstyle" ,rust-anstyle-1) + ("rust-anstyle-parse" ,rust-anstyle-parse-0.2) + ("rust-clap" ,rust-clap-4) + ("rust-clap-lex" ,rust-clap-lex-0.5) + ("rust-criterion" ,rust-criterion-0.5) + ("rust-regex" ,rust-regex-1)))) + (home-page "https://github.com/RustCrypto/formats/tree/master/tls_codec") + (synopsis "Rust implementation of TLS (de)serialization") + (description + "This package provides a Rust implementation of TLS serialization +and deserialization.") + (license (list license:asl2.0 license:expat)))) + +(define-public rust-tls-codec-derive-0.4 + (package + (name "rust-tls-codec-derive") + (version "0.4.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "tls_codec_derive" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1704w8zpgpj40yjgq9dddnnfzmq44p63n0606c1g6y8fcm2zb7ld")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; use of undeclared crate or module `tls_codec` + #:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-2)) + #:cargo-development-inputs (("rust-trybuild" ,rust-trybuild-1)))) + (home-page + "https://github.com/RustCrypto/formats/tree/master/tls_codec/derive") + (synopsis "Derive macros for the tls_codec trait") + (description + "This package provides Derive macros for the tls_codec trait.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-totp-lite-2 (package (name "rust-totp-lite") @@ -5798,8 +6500,37 @@ One-Time Password library.") (("rust-generic-array" ,rust-generic-array-0.12) ("rust-subtle" ,rust-subtle-2)))))) +(define-public rust-x25519-dalek-2 + (package + (name "rust-x25519-dalek") + (version "2.0.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "x25519-dalek" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0xyjgqpsa0q6pprakdp58q1hy45rf8wnqqscgzx0gyw13hr6ir67")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-curve25519-dalek" ,rust-curve25519-dalek-4) + ("rust-rand-core" ,rust-rand-core-0.6) + ("rust-serde" ,rust-serde-1) + ("rust-zeroize" ,rust-zeroize-1)) + #:cargo-development-inputs (("rust-bincode" ,rust-bincode-1) + ("rust-criterion" ,rust-criterion-0.5) + ("rust-rand-core" ,rust-rand-core-0.6)))) + (home-page "https://doc.dalek.rs/x25519_dalek") + (synopsis "X25519 elliptic curve Diffie-Hellman key exchange") + (description + "This crate provides a Rust implementation of x25519 elliptic curve +Diffie-Hellman key exchange, with curve operations provided by +@code{curve25519-dalek}.") + (license license:bsd-3))) + (define-public rust-x25519-dalek-1 (package + (inherit rust-x25519-dalek-2) (name "rust-x25519-dalek") (version "1.2.0") (source @@ -5810,25 +6541,15 @@ One-Time Password library.") (sha256 (base32 "0xz0m1pczss9r25d1r52420dl2picdypbcn5ycmlwssp9awvd4i3")) (modules '((guix build utils))) - (snippet - '(begin - (substitute* "Cargo.toml" - (("version = \"=1.3\"") "version = \"^1.3\"")))))) - (build-system cargo-build-system) + (snippet '(substitute* "Cargo.toml" + (("version = \"=1.3\"") "version = \"^1.3\""))))) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-curve25519-dalek" ,rust-curve25519-dalek-3) ("rust-rand-core" ,rust-rand-core-0.5) ("rust-serde" ,rust-serde-1) - ("rust-zeroize" ,rust-zeroize-1)))) - (home-page "https://dalek.rs/") - (synopsis "X25519 elliptic curve Diffie-Hellman key exchange") - (description - "This crate provides a pure-Rust implementation of x25519 elliptic curve -Diffie-Hellman key exchange, with curve operations provided by -@code{curve25519-dalek}.") - (license license:bsd-3))) + ("rust-zeroize" ,rust-zeroize-1)))))) (define-public rust-x25519-dalek-ng-1 (package @@ -5857,3 +6578,25 @@ Diffie-Hellman key exchange, with curve operations provided by (description "This package provides a fork x25519-dalek, with an updated rand_core.") (license license:bsd-3))) + +(define-public rust-z85-3 + (package + (name "rust-z85") + (version "3.0.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "z85" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1z10407jwvjfzpzaxwxgqsm9vcbyldzzh2qz2b0ijy2h3fprsn9a")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-development-inputs (("rust-proptest" ,rust-proptest-1)))) + (home-page "https://github.com/decafbad/z85") + (synopsis + "Rust implementation of ZeroMQ's Z85 encoding mechanism with padding") + (description + "This package provides a Rust implementation of @code{ZeroMQ's} Z85 +encoding mechanism with padding.") + (license (list license:expat license:asl2.0)))) diff --git a/gnu/packages/crates-graphics.scm b/gnu/packages/crates-graphics.scm index 117b4f5603..0c1b944736 100644 --- a/gnu/packages/crates-graphics.scm +++ b/gnu/packages/crates-graphics.scm @@ -292,22 +292,21 @@ styles (bold, underline).") (description "This package provides FFI bindings to aom.") (license license:expat))) -(define-public rust-ascii-canvas-2 +(define-public rust-ascii-canvas-3 (package (name "rust-ascii-canvas") - (version "2.0.0") + (version "3.0.0") (source (origin (method url-fetch) (uri (crate-uri "ascii-canvas" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0a9s8vrbc5jr6ry5ygjyfqmbs9gyya1v6dsxzsczpai8z4nvg3pz")))) + (base32 "1in38ziqn4kh9sw89ys4naaqzvvjscfs0m4djqbfq7455v5fq948")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t ;; TODO: failes due to an unresolved import - #:cargo-inputs - (("rust-term" ,rust-term-0.5)))) + `(#:cargo-inputs (("rust-term" ,rust-term-0.7)) + #:cargo-development-inputs (("rust-diff" ,rust-diff-0.1)))) (home-page "https://github.com/nikomatsakis/ascii-canvas") (synopsis "Simple canvas for drawing lines and styled text and emitting to the terminal") @@ -317,6 +316,22 @@ the term library to handle the ANSI nonsense and hence it works on Windows, Mac, and Unix.") (license (list license:asl2.0 license:expat)))) +(define-public rust-ascii-canvas-2 + (package + (inherit rust-ascii-canvas-3) + (name "rust-ascii-canvas") + (version "2.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "ascii-canvas" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0a9s8vrbc5jr6ry5ygjyfqmbs9gyya1v6dsxzsczpai8z4nvg3pz")))) + (arguments + `(#:skip-build? #t ;; TODO: failes due to an unresolved import + #:cargo-inputs (("rust-term" ,rust-term-0.5)))))) + (define-public rust-ash-0.37 (package (name "rust-ash") @@ -973,6 +988,25 @@ and iOS.") "This package provides a library to perform image color model conversion.") (license license:expat-0))) +(define-public rust-deltae-0.3 + (package + (name "rust-deltae") + (version "0.3.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "deltae" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1d3hw9hpvicl9x0x34jr2ybjk5g5ym1lhbyz6zj31110gq8zaaap")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-development-inputs (("rust-clap" ,rust-clap-4)))) + (home-page "https://gitlab.com/ryanobeirne/deltae") + (synopsis "Calculate delta-e between two colors") + (description "Calculate Delta E between two colors in CIE Lab space.") + (license license:expat))) + (define-public rust-drm-0.10 (package (name "rust-drm") @@ -1585,14 +1619,14 @@ EUI-64, also known as MAC-48 media access control addresses.") (package (inherit rust-glutin-0.31) (name "rust-glutin") - (version "0.30.7") + (version "0.30.10") (source (origin (method url-fetch) (uri (crate-uri "glutin" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "05gzw9icj4s0p9db9srnwrd3m3plcs7260jlblyy2pbiqygap6zq")))) + (base32 "1zk0cxchdy6fmnnwggylgg748wbk04mys9pv76nvh6974h1kpjcg")))) (arguments `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) @@ -1600,7 +1634,7 @@ EUI-64, also known as MAC-48 media access control addresses.") ("rust-cgl" ,rust-cgl-0.3) ("rust-core-foundation" ,rust-core-foundation-0.9) ("rust-dispatch" ,rust-dispatch-0.2) - ("rust-glutin-egl-sys" ,rust-glutin-egl-sys-0.4) + ("rust-glutin-egl-sys" ,rust-glutin-egl-sys-0.5) ("rust-glutin-glx-sys" ,rust-glutin-glx-sys-0.4) ("rust-glutin-wgl-sys" ,rust-glutin-wgl-sys-0.4) ("rust-libloading" ,rust-libloading-0.7) @@ -1611,6 +1645,40 @@ EUI-64, also known as MAC-48 media access control addresses.") ("rust-windows-sys" ,rust-windows-sys-0.45) ("rust-x11-dl" ,rust-x11-dl-2)))))) +(define-public rust-glutin-0.29 + (package + (inherit rust-glutin-0.31) + (name "rust-glutin") + (version "0.29.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "glutin" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "04y7s5m74j9gns5bdja0alkm0m0b727vf9k7rw6g5jpxjk99lk24")))) + (arguments + `(#:cargo-inputs (("rust-cgl" ,rust-cgl-0.3) + ("rust-cocoa" ,rust-cocoa-0.24) + ("rust-core-foundation" ,rust-core-foundation-0.9) + ("rust-glutin-egl-sys" ,rust-glutin-egl-sys-0.1) + ("rust-glutin-gles2-sys" ,rust-glutin-gles2-sys-0.1) + ("rust-glutin-glx-sys" ,rust-glutin-glx-sys-0.1) + ("rust-glutin-wgl-sys" ,rust-glutin-wgl-sys-0.1) + ("rust-libloading" ,rust-libloading-0.7) + ("rust-log" ,rust-log-0.4) + ("rust-objc" ,rust-objc-0.2) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-osmesa-sys" ,rust-osmesa-sys-0.1) + ("rust-parking-lot" ,rust-parking-lot-0.12) + ("rust-raw-window-handle" ,rust-raw-window-handle-0.5) + ("rust-wayland-client" ,rust-wayland-client-0.29) + ("rust-wayland-egl" ,rust-wayland-egl-0.29) + ("rust-winapi" ,rust-winapi-0.3) + ("rust-winit" ,rust-winit-0.27)))) + (native-inputs (list pkg-config)) + (inputs (list expat fontconfig freetype)))) + (define-public rust-glutin-0.28 (package (inherit rust-glutin-0.30) @@ -1734,6 +1802,22 @@ EUI-64, also known as MAC-48 media access control addresses.") (description "The egl bindings for glutin.") (license license:asl2.0))) +(define-public rust-glutin-egl-sys-0.5 + (package + (inherit rust-glutin-egl-sys-0.6) + (name "rust-glutin-egl-sys") + (version "0.5.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "glutin_egl_sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1iapzqscy4891crxdddddq4qqqday1sf0s0j762yqs2sdjr4wy5g")))) + (arguments + `(#:cargo-inputs (("rust-gl-generator" ,rust-gl-generator-0.14) + ("rust-windows-sys" ,rust-windows-sys-0.45)))))) + (define-public rust-glutin-egl-sys-0.4 (package (inherit rust-glutin-egl-sys-0.6) @@ -1851,17 +1935,16 @@ EUI-64, also known as MAC-48 media access control addresses.") (package (inherit rust-glutin-glx-sys-0.4) (name "rust-glutin-glx-sys") - (version "0.1.7") + (version "0.1.8") (source (origin (method url-fetch) (uri (crate-uri "glutin_glx_sys" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0l8kk60kq5v6hl1qr6ym2arzvbsgkh71aa8485cp901bq27kqfby")))) + (base32 "0s14s3v2dddkx141w2x65s8ik54mrn432hisbc65i62hhrshagfr")))) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-gl-generator" ,rust-gl-generator-0.14) ("rust-x11-dl" ,rust-x11-dl-2)))))) @@ -2189,14 +2272,14 @@ filters and decoders for the most common image formats.") (define-public rust-imgref-1 (package (name "rust-imgref") - (version "1.9.4") + (version "1.10.1") (source (origin (method url-fetch) (uri (crate-uri "imgref" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0b3czpz206z4nvpq7yq0v58bwjmqjwjmkr302hbzpp4523glkkxj")))) + (base32 "09l18s80crfn7g8ank3v44g43xns4pg7f6hpaz3sfna1bwsxmzj4")))) (build-system cargo-build-system) (home-page "https://github.com/kornelski/imgref") (synopsis "2D slice of a @code{Vec}") @@ -2256,7 +2339,7 @@ pixel buffers with width, height and stride.") ("rust-rayon" ,rust-rayon-1)) #:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.3) - ("rust-png" ,rust-png-0.14) + ("rust-png" ,rust-png-0.16) ("rust-walkdir" ,rust-walkdir-2)))))) (define-public rust-keyframe-1 @@ -2545,14 +2628,19 @@ graphics and video games.") (define-public rust-palette-0.7 (package (name "rust-palette") - (version "0.7.3") + (version "0.7.5") (source (origin (method url-fetch) (uri (crate-uri "palette" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1p2inf23vsqy06w7vp7rcxmb9vk91asib534m9cafykn8x0z7qmj")))) + (base32 "0ynr6q7629gpw6pg8w1wrsl31sq48nxh1bg4awyrhhk6nyj27z7b")) + (modules '((guix build utils))) + (snippet + '(begin (substitute* "Cargo.toml" + (("\"=([[:digit:]]+(\\.[[:digit:]]+)*)" _ version) + (string-append "\"^" version))))))) (build-system cargo-build-system) (arguments `(#:tests? #f ; Regression tests not included. @@ -2567,17 +2655,10 @@ graphics and video games.") ("rust-serde" ,rust-serde-1) ("rust-wide" ,rust-wide-0.7)) #:cargo-development-inputs - (("rust-clap" ,rust-clap-3) - ("rust-criterion" ,rust-criterion-0.4) - ("rust-csv" ,rust-csv-1) - ("rust-enterpolation" ,rust-enterpolation-0.2) + (("rust-enterpolation" ,rust-enterpolation-0.2) ("rust-image" ,rust-image-0.23) - ("rust-lazy-static" ,rust-lazy-static-1) ("rust-rand-mt" ,rust-rand-mt-4) ("rust-ron" ,rust-ron-0.8) - ("rust-scad" ,rust-scad-1) - ("rust-serde" ,rust-serde-1) - ("rust-serde-derive" ,rust-serde-derive-1) ("rust-serde-json" ,rust-serde-json-1)))) (home-page "https://github.com/Ogeon/palette") (synopsis "Convert and manage colors") @@ -2621,14 +2702,14 @@ on correctness, flexibility and ease of use.") (define-public rust-palette-derive-0.7 (package (name "rust-palette-derive") - (version "0.7.3") + (version "0.7.5") (source (origin (method url-fetch) (uri (crate-uri "palette_derive" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "02ps239sxcr5v294qf89d87sv7fdm9pr2cziwj2l6ggzql703nxp")))) + (base32 "0vcxjslri6f24zgv3n6ixhzb21a8z23fa6h42s8ss2zcvc10g2g8")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-find-crate" ,rust-find-crate-0.6) @@ -2906,29 +2987,44 @@ interactive applications.") (define-public rust-png-0.17 (package (name "rust-png") - (version "0.17.7") + (version "0.17.13") (source (origin (method url-fetch) (uri (crate-uri "png" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0f66slx641p7an277xskz8vq7syy9cmhsx1qwnfb268ahspqww2x")))) + (base32 "1qdmajjzkdbmk5zk7qb5pc6927xa26hr2v68hbkpa9ris79v1r06")))) (build-system cargo-build-system) (arguments - `(#:tests? #false ;XXX missing files in tarball + `(#:cargo-test-flags + '("--release" "--" + ;; Not all files incuded. + "--skip=decoder::stream::tests::image_gamma" + "--skip=decoder::stream::tests::image_source_chromaticities" + "--skip=decoder::stream::tests::test_two_iccp_chunks" + "--skip=encoder::tests::image_palette" + "--skip=src/decoder/mod.rs - decoder::Decoder<R>::set_ignore_text_chunk (line 269)" + "--skip=src/decoder/mod.rs - decoder::Decoder<R>::set_limits (line 182)" + "--skip=src/lib.rs - (line 13)" + "--skip=src/text_metadata.rs - text_metadata (line 25)") #:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) ("rust-crc32fast" ,rust-crc32fast-1) - ("rust-deflate" ,rust-deflate-1) - ("rust-miniz-oxide" ,rust-miniz-oxide-0.6)) + ("rust-fdeflate" ,rust-fdeflate-0.3) + ("rust-flate2" ,rust-flate2-1) + ("rust-miniz-oxide" ,rust-miniz-oxide-0.7)) #:cargo-development-inputs - (("rust-criterion" ,rust-criterion-0.3) + (("rust-byteorder" ,rust-byteorder-1) + ("rust-clap" ,rust-clap-3) + ("rust-criterion" ,rust-criterion-0.4) ("rust-getopts" ,rust-getopts-0.2) - ("rust-glium" ,rust-glium-0.31) + ("rust-glium" ,rust-glium-0.32) ("rust-glob" ,rust-glob-0.3) ("rust-rand" ,rust-rand-0.8) ("rust-term" ,rust-term-0.7)))) + (native-inputs (list pkg-config)) + (inputs (list expat fontconfig freetype)) (home-page "https://github.com/image-rs/image-png") (synopsis "PNG decoding and encoding library in pure Rust") (description @@ -3070,17 +3166,23 @@ interactive applications.") (define-public rust-ravif-0.11 (package (name "rust-ravif") - (version "0.11.3") + (version "0.11.6") (source (origin (method url-fetch) (uri (crate-uri "ravif" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1vhn2p31z31c01j6i28slgbi01wq1hmyqjidwfkqy430hh16kp5s")))) + (base32 "1315abwxldavjxdl8dphab16fh8akw000hn406dbjnsi53b4kgl5")) + (modules '((guix build utils))) + (snippet + '(begin (substitute* "Cargo.toml" + (("\"=([[:digit:]]+(\\.[[:digit:]]+)*)" _ version) + (string-append "\"^" version))))))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-avif-serialize" ,rust-avif-serialize-0.8) + ("rust-bitstream-io" ,rust-bitstream-io-2) ("rust-imgref" ,rust-imgref-1) ("rust-loop9" ,rust-loop9-0.1) ("rust-quick-error" ,rust-quick-error-2) @@ -3111,7 +3213,8 @@ in AVIF format (powers the @code{cavif} tool).") (sha256 (base32 "1r3s78781kb9lwysdvpdc80gavly33dcs4inhhp2dawml9g3rjss")))) (arguments - `(#:cargo-inputs + `(#:skip-build? #t ; Needs rav1e-0.6 + #:cargo-inputs (("rust-avif-serialize" ,rust-avif-serialize-0.7) ("rust-imgref" ,rust-imgref-1) ("rust-loop9" ,rust-loop9-0.1) @@ -3283,7 +3386,7 @@ in AVIF format (powers the @code{cavif} tool).") (define-public rust-rgb-0.8 (package (name "rust-rgb") - (version "0.8.36") + (version "0.8.37") (source (origin (method url-fetch) @@ -3291,7 +3394,7 @@ in AVIF format (powers the @code{cavif} tool).") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0ncgzkgifbyfx7vpnygfl4mgpdhhbaywxybx6pnjraf77wz2vv10")))) + "1n275hng7hmnzjavmdf24vqd86nm6bkg80nhr4zmgzb49c0aiah5")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -3848,22 +3951,22 @@ applications.") (define-public rust-wayland-backend-0.3 (package (name "rust-wayland-backend") - (version "0.3.2") + (version "0.3.3") (source (origin (method url-fetch) (uri (crate-uri "wayland-backend" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1r7vz56z6ixfbljraxl4q59g43jfb6i9qkaksi704pzlfgfjs58r")))) + (base32 "0h4s8nfrl1q8xys1409lfwkb70cdh81c0pvzr1s69mwhrrhzll4x")))) (build-system cargo-build-system) (arguments `(#:tests? #f ; use of undeclared crate or module `wayland_scanner` #:cargo-inputs (("rust-cc" ,rust-cc-1) ("rust-downcast-rs" ,rust-downcast-rs-1) ("rust-log" ,rust-log-0.4) - ("rust-nix" ,rust-nix-0.26) ("rust-raw-window-handle" ,rust-raw-window-handle-0.5) + ("rust-rustix" ,rust-rustix-0.38) ("rust-scoped-tls" ,rust-scoped-tls-1) ("rust-smallvec" ,rust-smallvec-1) ("rust-wayland-sys" ,rust-wayland-sys-0.31)) @@ -3906,20 +4009,20 @@ protocol.") (define-public rust-wayland-client-0.31 (package (name "rust-wayland-client") - (version "0.31.1") + (version "0.31.2") (source (origin (method url-fetch) (uri (crate-uri "wayland-client" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1lryhibzmi4hb3jpbraj623l110f6rgp0migpxrm8vrl8wixb9qw")))) + (base32 "07rzml07li3bi4nnqx4i2rfj3xkifzxp1d6cd1kflb2wjgp9dyw2")))) (build-system cargo-build-system) (arguments `(#:tests? #f ; use of undeclared crate or module `wayland_protocols` #:cargo-inputs (("rust-bitflags" ,rust-bitflags-2) ("rust-log" ,rust-log-0.4) - ("rust-nix" ,rust-nix-0.26) + ("rust-rustix" ,rust-rustix-0.38) ("rust-wayland-backend" ,rust-wayland-backend-0.3) ("rust-wayland-scanner" ,rust-wayland-scanner-0.31)) #:cargo-development-inputs (("rust-futures-channel" ,rust-futures-channel-0.3) @@ -4181,17 +4284,17 @@ and wayland-server.") (define-public rust-wayland-cursor-0.31 (package (name "rust-wayland-cursor") - (version "0.31.0") + (version "0.31.1") (source (origin (method url-fetch) (uri (crate-uri "wayland-cursor" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0nxdyyg3a3649n316fbnm8rak5k90j580kfnfxn9src6x45a4jm4")))) + (base32 "1fii68l6x235b867q96yx1xqkl16azkf5i841ldd24yxd2l5zkki")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs (("rust-nix" ,rust-nix-0.26) + `(#:cargo-inputs (("rust-rustix" ,rust-rustix-0.38) ("rust-wayland-client" ,rust-wayland-client-0.31) ("rust-xcursor" ,rust-xcursor-0.3)))) (home-page "https://github.com/smithay/wayland-rs") @@ -4286,14 +4389,14 @@ initializing an OpenGL or Vulkan context.") (define-public rust-wayland-protocols-0.31 (package (name "rust-wayland-protocols") - (version "0.31.0") + (version "0.31.2") (source (origin (method url-fetch) (uri (crate-uri "wayland-protocols" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "077257bxv21whi33wm0lz5jkq6jnx0spz5jkq8yr44x9gc8dflz2")))) + (base32 "1x310l1p6p3p3l76nl1l2yava9408dy77s605917zadlp1jz70cg")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-2) @@ -4490,14 +4593,14 @@ protocol extensions.") (define-public rust-wayland-scanner-0.31 (package (name "rust-wayland-scanner") - (version "0.31.0") + (version "0.31.1") (source (origin (method url-fetch) (uri (crate-uri "wayland-scanner" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1760n887j18lzd1ni087q7jzsmpcf7ny3dq2698zkjb56r02i3pv")))) + (base32 "10y2nq076x4zml8wc5bw75560rwvrsfpi35mdyc02w1854lsdcv3")))) (build-system cargo-build-system) (arguments `(#:cargo-test-flags '("--release" "--" @@ -4505,7 +4608,7 @@ protocol extensions.") "--skip=interfaces::tests::interface_gen" "--skip=server_gen::tests::server_gen") #:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) - ("rust-quick-xml" ,rust-quick-xml-0.30) + ("rust-quick-xml" ,rust-quick-xml-0.31) ("rust-quote" ,rust-quote-1)) #:cargo-development-inputs (("rust-similar" ,rust-similar-2)))) (home-page "https://github.com/smithay/wayland-rs") @@ -4613,21 +4716,21 @@ wayland-client crate for usable bindings.") (define-public rust-wayland-server-0.31 (package (name "rust-wayland-server") - (version "0.31.0") + (version "0.31.1") (source (origin (method url-fetch) (uri (crate-uri "wayland-server" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1kmiii32hi7h3r9q923q628rrbglkjkg362c32hnr4s5li90qgrz")))) + (base32 "1dzxfabykj156abnbx2i8j8gvmgb9yys9mfj9sx29g45qbay9rh0")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-2) ("rust-downcast-rs" ,rust-downcast-rs-1) ("rust-io-lifetimes" ,rust-io-lifetimes-2) ("rust-log" ,rust-log-0.4) - ("rust-nix" ,rust-nix-0.26) + ("rust-rustix" ,rust-rustix-0.38) ("rust-wayland-backend" ,rust-wayland-backend-0.3) ("rust-wayland-scanner" ,rust-wayland-scanner-0.31)))) (home-page "https://github.com/smithay/wayland-rs") diff --git a/gnu/packages/crates-gtk.scm b/gnu/packages/crates-gtk.scm index 51f02788d3..9c01ce3142 100644 --- a/gnu/packages/crates-gtk.scm +++ b/gnu/packages/crates-gtk.scm @@ -3054,8 +3054,37 @@ library.") (("rust-shell-words" ,rust-shell-words-0.1) ("rust-tempfile" ,rust-tempfile-3)))))) +(define-public rust-pangocairo-0.18 + (package + (name "rust-pangocairo") + (version "0.18.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "pangocairo" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "199qdgw5mf1vbqmslscy1qzz0szw2dcd21p6z61wzjngm64na0sp")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-cairo-rs" ,rust-cairo-rs-0.18) + ("rust-glib" ,rust-glib-0.18) + ("rust-libc" ,rust-libc-0.2) + ("rust-pango" ,rust-pango-0.18) + ("rust-pangocairo-sys" ,rust-pangocairo-sys-0.18)) + #:cargo-development-inputs + (("rust-gir-format-check" ,rust-gir-format-check-0.1)))) + (native-inputs (list pkg-config)) + (inputs (list pango)) + (home-page "https://gtk-rs.org/") + (synopsis "Rust bindings for the PangoCairo library") + (description + "This package provides Rust bindings for the @code{PangoCairo} library.") + (license license:expat))) + (define-public rust-pangocairo-0.17 (package + (inherit rust-pangocairo-0.18) (name "rust-pangocairo") (version "0.17.10") (source @@ -3065,7 +3094,6 @@ library.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "1kr2b31034b8zif4r3lf4rniqphk2bxi2q7n8iwq2wrf3k5jkgw6")))) - (build-system cargo-build-system) (arguments `(;; FIXME: error[E0277]: `Errors` doesn't implement `std::fmt::Display` #:tests? #f @@ -3077,16 +3105,7 @@ library.") ("rust-pango" ,rust-pango-0.17) ("rust-pangocairo-sys" ,rust-pangocairo-sys-0.17)) #:cargo-development-inputs - (("rust-gir-format-check" ,rust-gir-format-check-0.1)))) - (native-inputs - (list pkg-config)) - (inputs - (list pango)) - (home-page "https://gtk-rs.org/") - (synopsis "Rust bindings for the PangoCairo library") - (description - "This package provides Rust bindings for the @code{PangoCairo} library.") - (license license:expat))) + (("rust-gir-format-check" ,rust-gir-format-check-0.1)))))) (define-public rust-pangocairo-0.15 (package @@ -3114,8 +3133,38 @@ library.") #:cargo-development-inputs (("rust-gir-format-check" ,rust-gir-format-check-0.1)))))) +(define-public rust-pangocairo-sys-0.18 + (package + (name "rust-pangocairo-sys") + (version "0.18.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "pangocairo-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0cw82261ixgr9xw549rx11w74h0wz4lw0pqxxir7lzm3fvv8yg7w")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-cairo-sys-rs" ,rust-cairo-sys-rs-0.18) + ("rust-glib-sys" ,rust-glib-sys-0.18) + ("rust-libc" ,rust-libc-0.2) + ("rust-pango-sys" ,rust-pango-sys-0.18) + ("rust-system-deps" ,rust-system-deps-6)) + #:cargo-development-inputs (("rust-shell-words" ,rust-shell-words-1) + ("rust-tempfile" ,rust-tempfile-3)))) + (native-inputs (list pkg-config)) + (inputs + ;; XXX: Should these be propagated from their respective crates? + (list cairo glib pango)) + (home-page "https://gtk-rs.org/") + (synopsis "FFI bindings to libgtk-3") + (description "This package provides FFI bindings to @code{PangoCairo}.") + (license license:expat))) + (define-public rust-pangocairo-sys-0.17 (package + (inherit rust-pangocairo-sys-0.18) (name "rust-pangocairo-sys") (version "0.17.10") (source @@ -3125,7 +3174,6 @@ library.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "0ymr4aqrdpysz0rh383s4h6hj8nbkyj7n4723f45zzzqkf6x7pwl")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-cairo-sys-rs" ,rust-cairo-sys-rs-0.17) @@ -3133,18 +3181,8 @@ library.") ("rust-libc" ,rust-libc-0.2) ("rust-pango-sys" ,rust-pango-sys-0.17) ("rust-system-deps" ,rust-system-deps-6)) - #:cargo-development-inputs - (("rust-shell-words" ,rust-shell-words-1) - ("rust-tempfile" ,rust-tempfile-3)))) - (native-inputs - (list pkg-config)) - (inputs - ;; XXX: Should these be propagated from their respective crates? - (list cairo glib pango)) - (home-page "https://gtk-rs.org/") - (synopsis "FFI bindings to libgtk-3") - (description "This package provides FFI bindings to @code{PangoCairo}.") - (license license:expat))) + #:cargo-development-inputs (("rust-shell-words" ,rust-shell-words-1) + ("rust-tempfile" ,rust-tempfile-3)))))) (define-public rust-pangocairo-sys-0.15 (package diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 9fbe0e2a6a..22c6136852 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -42,6 +42,8 @@ ;;; Copyright © 2024 Herman Rimm <herman@rimm.ee> ;;; Copyright © 2024 Tomas Volf <~@wolfsden.cz> ;;; Copyright © 2024 Suhail Singh <suhail@bayesians.ca> +;;; Copyright © 2024 Aaron Covrig <aaron.covrig.us@ieee.org> +;;; Copyright © 2024 Nguyễn Gia Phong <mcsinyx@disroot.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -67,6 +69,7 @@ #:use-module (guix gexp) #:use-module (guix utils) #:use-module (gnu packages) + #:use-module (gnu packages acl) #:use-module (gnu packages admin) #:use-module (gnu packages audio) #:use-module (gnu packages autotools) @@ -111,6 +114,7 @@ #:use-module (gnu packages python) #:use-module (gnu packages rust) #:use-module (gnu packages rust-apps) + #:use-module (gnu packages selinux) #:use-module (gnu packages sequoia) #:use-module (gnu packages serialization) #:use-module (gnu packages shells) @@ -176,8 +180,53 @@ rasterizing OpenType font glyphs.") cubic beziers.") (license license:asl2.0))) +(define-public rust-abi-stable-0.11 + (package + (name "rust-abi-stable") + (version "0.11.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "abi_stable" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0if428pq8ly97zi6q1842nak977rwxnj17650i8gwpxh7qnm3mk9")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-test-flags + '("--release" "--features=testing") + #:cargo-inputs (("rust-abi-stable-derive" ,rust-abi-stable-derive-0.11) + ("rust-abi-stable-shared" ,rust-abi-stable-shared-0.11) + ("rust-const-panic" ,rust-const-panic-0.2) + ("rust-core-extensions" ,rust-core-extensions-1) + ("rust-crossbeam-channel" ,rust-crossbeam-channel-0.5) + ("rust-generational-arena" ,rust-generational-arena-0.2) + ("rust-libloading" ,rust-libloading-0.7) + ("rust-lock-api" ,rust-lock-api-0.4) + ("rust-parking-lot" ,rust-parking-lot-0.12) + ("rust-paste" ,rust-paste-1) + ("rust-repr-offset" ,rust-repr-offset-0.2) + ("rust-rustc-version" ,rust-rustc-version-0.4) + ("rust-serde" ,rust-serde-1) + ("rust-serde-derive" ,rust-serde-derive-1) + ("rust-serde-json" ,rust-serde-json-1)) + #:cargo-development-inputs (("rust-bincode" ,rust-bincode-1) + ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.8) + ("rust-fnv" ,rust-fnv-1) + ("rust-hashbrown" ,rust-hashbrown-0.13) + ("rust-rand" ,rust-rand-0.8) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-trybuild" ,rust-trybuild-1)))) + (home-page "https://github.com/rodrimati1992/abi_stable_crates/") + (synopsis "Rust-to-Rust ffi,writing libraries loaded at program startup") + (description + "This package contains code for doing Rust-to-Rust ffi, writing libraries +loaded at program startup.") + (license (list license:expat license:asl2.0)))) + (define-public rust-abi-stable-0.10 (package + (inherit rust-abi-stable-0.11) (name "rust-abi-stable") (version "0.10.5") (source @@ -194,7 +243,6 @@ cubic beziers.") " <([[:digit:]]+\\.[[:digit:]]+\\.[[:digit:]]+)") _ version _) (string-append ">=" version))))))) - (build-system cargo-build-system) (arguments `(#:tests? #f ; tests must be run with the "testing" feature #:cargo-inputs @@ -219,16 +267,43 @@ cubic beziers.") ("rust-fnv" ,rust-fnv-1) ("rust-hashbrown" ,rust-hashbrown-0.11) ("rust-rand" ,rust-rand-0.8) - ("rust-serde-json" ,rust-serde-json-1)))) + ("rust-serde-json" ,rust-serde-json-1)))))) + +(define-public rust-abi-stable-derive-0.11 + (package + (name "rust-abi-stable-derive") + (version "0.11.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "abi_stable_derive" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "16780mmr2hwx8ajcq59nhvq3krv5i8r7mg41x08fx907nil885yp")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-test-flags + '("--release" "--" + "--skip=sabi_trait::tests::sabi_trait_test_cases" + "--skip=stable_abi::tests::test_cases") + #:cargo-inputs (("rust-abi-stable-shared" ,rust-abi-stable-shared-0.11) + ("rust-as-derive-utils" ,rust-as-derive-utils-0.11) + ("rust-core-extensions" ,rust-core-extensions-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) + ("rust-typed-arena" ,rust-typed-arena-2)) + #:cargo-development-inputs + (("rust-as-derive-utils" ,rust-as-derive-utils-0.11)))) (home-page "https://github.com/rodrimati1992/abi_stable_crates/") - (synopsis "Rust-to-Rust ffi,writing libraries loaded at program startup") - (description - "This package contains code for doing Rust-to-Rust ffi,writing libraries -loaded at program startup.") + (synopsis "Implementation detail of abi_stable.") + (description "This package contains an implementation detail of abi_stable.") (license (list license:expat license:asl2.0)))) (define-public rust-abi-stable-derive-0.10 (package + (inherit rust-abi-stable-derive-0.11) (name "rust-abi-stable-derive") (version "0.10.3") (source @@ -238,7 +313,6 @@ loaded at program startup.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "1w503n9rxja3h8ls6p5xsly8aclbp30dm4hd0525bvpbippi161v")))) - (build-system cargo-build-system) (arguments `(#:cargo-test-flags '("--release" "--" @@ -254,23 +328,19 @@ loaded at program startup.") ("rust-syn" ,rust-syn-1) ("rust-typed-arena" ,rust-typed-arena-2)) #:cargo-development-inputs - (("rust-as-derive-utils" ,rust-as-derive-utils-0.10)))) - (home-page "https://github.com/rodrimati1992/abi_stable_crates/") - (synopsis "Implementation detail of abi_stable.") - (description "This package contains an implementation detail of abi_stable.") - (license (list license:expat license:asl2.0)))) + (("rust-as-derive-utils" ,rust-as-derive-utils-0.10)))))) -(define-public rust-abi-stable-shared-0.10 +(define-public rust-abi-stable-shared-0.11 (package (name "rust-abi-stable-shared") - (version "0.10.3") + (version "0.11.0") (source (origin (method url-fetch) (uri (crate-uri "abi_stable_shared" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0psaz0vghdz84vrb311g4b74d2nhrlbmwxa8if88s0bf0s4xmsgc")))) + (base32 "0qrbmlypvxx3zij1c6w6yykpp5pjcfx9qr2d9lzyc8y1i1vdzddj")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-core-extensions" ,rust-core-extensions-1)))) @@ -279,6 +349,21 @@ loaded at program startup.") (description "This package contains an implementation detail of abi_stable.") (license (list license:expat license:asl2.0)))) +(define-public rust-abi-stable-shared-0.10 + (package + (inherit rust-abi-stable-shared-0.11) + (name "rust-abi-stable-shared") + (version "0.10.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "abi_stable_shared" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0psaz0vghdz84vrb311g4b74d2nhrlbmwxa8if88s0bf0s4xmsgc")))) + (arguments + `(#:cargo-inputs (("rust-core-extensions" ,rust-core-extensions-1)))))) + (define-public rust-abomonation-0.7 (package (name "rust-abomonation") @@ -449,8 +534,46 @@ syntax (e.g. EasyList, EasyPrivacy) filter parsing and matching.") ("rust-sha2" ,rust-sha2-0.9) ("rust-tokio" ,rust-tokio-1)))))) +(define-public rust-addr2line-0.21 + (package + (name "rust-addr2line") + (version "0.21.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "addr2line" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1jx0k3iwyqr8klqbzk6kjvr496yd94aspis10vwsj5wy7gib4c4a")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; use of undeclared crate or module `auxiliary` + #:cargo-inputs + (("rust-compiler-builtins" ,rust-compiler-builtins-0.1) + ("rust-cpp-demangle" ,rust-cpp-demangle-0.4) + ("rust-fallible-iterator" ,rust-fallible-iterator-0.3) + ("rust-gimli" ,rust-gimli-0.28) + ("rust-memmap2" ,rust-memmap2-0.5) + ("rust-object" ,rust-object-0.32) + ("rust-rustc-demangle" ,rust-rustc-demangle-0.1) + ("rust-rustc-std-workspace-alloc" ,rust-rustc-std-workspace-alloc-1) + ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1) + ("rust-smallvec" ,rust-smallvec-1)) + #:cargo-development-inputs (("rust-backtrace" ,rust-backtrace-0.3) + ("rust-clap" ,rust-clap-4) + ("rust-findshlibs" ,rust-findshlibs-0.10) + ("rust-libtest-mimic" ,rust-libtest-mimic-0.6) + ("rust-typed-arena" ,rust-typed-arena-2)))) + (home-page "https://github.com/gimli-rs/addr2line") + (synopsis "Symbolication library written in Rust, using gimli") + (description + "This package provides a cross-platform symbolication library written in +Rust, using gimli.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-addr2line-0.19 (package + (inherit rust-addr2line-0.21) (name "rust-addr2line") (version "0.19.0") (source (origin @@ -460,7 +583,6 @@ syntax (e.g. EasyList, EasyPrivacy) filter parsing and matching.") (sha256 (base32 "15ywmr5wx22q69ffnn79qp65ir5p1x0k2q06plcpv6v74c5xcvx7")))) - (build-system cargo-build-system) (arguments `(#:tests? #f ; use of undeclared crate or module `auxiliary` #:cargo-inputs @@ -479,13 +601,7 @@ syntax (e.g. EasyList, EasyPrivacy) filter parsing and matching.") ("rust-findshlibs" ,rust-findshlibs-0.10) ("rust-memmap2" ,rust-memmap2-0.5) ("rust-rustc-test" ,rust-rustc-test-0.3) - ("rust-typed-arena" ,rust-typed-arena-2)))) - (home-page "https://github.com/gimli-rs/addr2line") - (synopsis "Symbolication library written in Rust, using gimli") - (description - "This package provides a cross-platform symbolication library written in -Rust, using gimli.") - (license (list license:asl2.0 license:expat)))) + ("rust-typed-arena" ,rust-typed-arena-2)))))) (define-public rust-addchain-0.2 (package @@ -647,6 +763,31 @@ the Rust programming language.") "Fuzz Rust code with american-fuzzy-lop.") (license license:asl2.0))) +(define-public rust-afl-0.11 + (package + (inherit rust-afl-0.12) + (name "rust-afl") + (version "0.11.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "afl" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0a2jm690mcxd073j9isd16rpzkjfmpgamw9h64f5l2fpns0423vc")))) + (arguments + `(#:skip-build? #t ; We don't want to add AFL as an input. + #:cargo-inputs (("rust-cc" ,rust-cc-1) + ("rust-clap" ,rust-clap-2) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-rustc-version" ,rust-rustc-version-0.4) + ("rust-xdg" ,rust-xdg-2)) + #:cargo-development-inputs (("rust-tempfile" ,rust-tempfile-3)) + #:phases (modify-phases %standard-phases + ;; Custom archive file for test suite. + (delete 'check-for-pregenerated-files)))))) + (define-public rust-ahash-0.8 (package (name "rust-ahash") @@ -982,7 +1123,6 @@ code that is generic with regard to the algebraic entity types.") (sha256 (base32 "0abzqsxd09jxl01brzjnwk8zg7k8zma76gzq87385q8fqm710jxb")))) (build-system cargo-build-system) - (arguments '(#:skip-build? #t)) (home-page "https://github.com/avitex/rust-aliasable-deref-trait") (synopsis "Marker trait for aliasable pointers") (description @@ -1003,8 +1143,7 @@ address that is aliasable when coerced to a raw pointer") (base32 "1z8548zdjlm4ps1k0d7x68lfdyji02crwcc9rw3q3bb106f643r5")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-aliasable-deref-trait" ,rust-aliasable-deref-trait-0.2) ("rust-stable-deref-trait" ,rust-stable-deref-trait-1)))) (home-page "https://github.com/avitex/rust-aliasable") @@ -1098,6 +1237,27 @@ be used with the stdlib.") (description "Mirror of Rust's allocator API.") (license (list license:expat license:asl2.0)))) +(define-public rust-alphanumeric-sort-1 + (package + (name "rust-alphanumeric-sort") + (version "1.5.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "alphanumeric-sort" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "13vyx3cqpylvc0md4563rd42b7dvk3fv4wny0kpcc48gy72n0z6n")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-development-inputs (("rust-bencher" ,rust-bencher-0.1)))) + (home-page "https://magiclen.org/alphanumeric-sort") + (synopsis "Sort order for files and folders whose names contain numerals") + (description + "This crate can help you sort order for files and folders whose names +contain numerals.") + (license license:expat))) + (define-public rust-alsa-0.8 (package (name "rust-alsa") @@ -1520,8 +1680,34 @@ it outputs messages to Android's logcat.") ;; The user can choose either license. (license (list license:expat license:asl2.0)))) +(define-public rust-annotate-snippets-0.10 + (package + (name "rust-annotate-snippets") + (version "0.10.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "annotate-snippets" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1rmzxhi079d6j67x1dyv3sjkrc13x6av513cn27pwjl8i5bnd6vd")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-anstyle" ,rust-anstyle-1) + ("rust-unicode-width" ,rust-unicode-width-0.1)) + #:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.5) + ("rust-difference" ,rust-difference-2) + ("rust-glob" ,rust-glob-0.3) + ("rust-serde" ,rust-serde-1) + ("rust-toml" ,rust-toml-0.5)))) + (home-page "https://github.com/rust-lang/annotate-snippets-rs") + (synopsis "Library for building code annotations") + (description "Library for building code annotations.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-annotate-snippets-0.9 (package + (inherit rust-annotate-snippets-0.10) (name "rust-annotate-snippets") (version "0.9.2") (source @@ -1531,7 +1717,6 @@ it outputs messages to Android's logcat.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "07p8r6jzb7nqydq0kr5pllckqcdxlyld2g275v425axnzffpxbyc")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-unicode-width" ,rust-unicode-width-0.1) ("rust-yansi-term" ,rust-yansi-term-0.1)) @@ -1540,11 +1725,7 @@ it outputs messages to Android's logcat.") ("rust-glob" ,rust-glob-0.3) ("rust-serde" ,rust-serde-1) ("rust-toml" ,rust-toml-0.5) - ("rust-yansi-term" ,rust-yansi-term-0.1)))) - (home-page "https://github.com/rust-lang/annotate-snippets-rs") - (synopsis "Library for building code annotations") - (description "Library for building code annotations.") - (license (list license:asl2.0 license:expat)))) + ("rust-yansi-term" ,rust-yansi-term-0.1)))))) (define-public rust-ansi-parser-0.8 (package @@ -1584,17 +1765,81 @@ it outputs messages to Android's logcat.") (("rust-heapless" ,rust-heapless-0.5) ("rust-nom" ,rust-nom-4)))))) +(define-public rust-ansi-str-0.8 + (package + (name "rust-ansi-str") + (version "0.8.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "ansi-str" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "07ddhqynv05xjyhw295w29qy77fi84sh5p2mm46ap0d94s4mgx0w")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-ansitok" ,rust-ansitok-0.2)) + #:cargo-development-inputs (("rust-owo-colors" ,rust-owo-colors-3)))) + (home-page "https://github.com/zhiburt/ansi-str") + (synopsis + "Library which provides a set of methods to work with ANSI strings") + (description + "This package provides a library which provides a set of methods to work +with ANSI strings.") + (license license:expat))) + +(define-public rust-ansi-width-0.1 + (package + (name "rust-ansi-width") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "ansi-width" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "023693dwvci91456nfi0aygc44i1f098l2f23ssq67b1ybk3r7i1")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-unicode-width" ,rust-unicode-width-0.1)))) + (home-page "https://docs.rs/ansi-width") + (synopsis "Calculate the width of a string when printed to the terminal") + (description + "Calculate the width of a string when printed to the terminal.") + (license license:expat))) + +(define-public rust-ansitok-0.2 + (package + (name "rust-ansitok") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "ansitok" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "10vc2d1325qsbvbnqnj48zg55wv7jz929drx9vpdscdvl7k48012")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-nom" ,rust-nom-7) + ("rust-vte" ,rust-vte-0.10)))) + (home-page "https://gitlab.com/zhiburt/ansitok") + (synopsis "Library for parsing ANSI Escape Codes") + (description + "This package provides a library for parsing ANSI Escape Codes.") + (license license:expat))) + (define-public rust-anstream-0.6 (package (name "rust-anstream") - (version "0.6.11") + (version "0.6.13") (source (origin (method url-fetch) (uri (crate-uri "anstream" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "19dndamalavhjwp4i74k8hdijcixb7gsfa6ycwyc1r8xn6y1wbkf")))) + (base32 "1yv2idkyf9mp9xwc684v0ywqiy86lwc9gvllwdishl7y6czx0syr")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -1695,26 +1940,47 @@ text to a terminal.") `(#:cargo-development-inputs (("rust-lexopt" ,rust-lexopt-0.3)))))) +(define-public rust-anstyle-lossy-1 + (package + (name "rust-anstyle-lossy") + (version "1.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "anstyle-lossy" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "10c1cg8vjb7mxwky2xc8j7zdp15i1qvpmd2w6nlsxm6vcx3l9859")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-anstyle" ,rust-anstyle-1)))) + (home-page "https://github.com/rust-cli/anstyle") + (synopsis "conversion between ANSI color codes") + (description "Lossy conversion between ANSI Color Codes.") + (license (list license:expat license:asl2.0)))) + (define-public rust-anstyle-parse-0.2 (package (name "rust-anstyle-parse") - (version "0.2.0") + (version "0.2.3") (source (origin (method url-fetch) (uri (crate-uri "anstyle-parse" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1vjprf080adyxxpls9iwwny3g7irawfns9s2cj9ngq28dqhzsrg7")))) + "134jhzrz89labrdwxxnjxqjdg06qvaflj1wkfnmyapwyldfwcnn7")))) (build-system cargo-build-system) (arguments - `(#:tests? #f ; Not all files included. + `(#:cargo-test-flags + '("--release" "--" + "--skip=state::codegen::table") #:cargo-inputs (("rust-arrayvec" ,rust-arrayvec-0.7) ("rust-utf8parse" ,rust-utf8parse-0.2)) #:cargo-development-inputs - (("rust-codegenrs" ,rust-codegenrs-2) - ("rust-criterion" ,rust-criterion-0.4) + (("rust-codegenrs" ,rust-codegenrs-3) + ("rust-criterion" ,rust-criterion-0.5) ("rust-proptest" ,rust-proptest-1) ("rust-snapbox" ,rust-snapbox-0.4) ("rust-vte-generate-state-changes" ,rust-vte-generate-state-changes-0.1)))) @@ -1752,17 +2018,17 @@ text to a terminal.") (define-public rust-anstyle-query-1 (package (name "rust-anstyle-query") - (version "1.0.0") + (version "1.0.2") (source (origin (method url-fetch) (uri (crate-uri "anstyle-query" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0js9bgpqz21g0p2nm350cba1d0zfyixsma9lhyycic5sw55iv8aw")))) + "0j3na4b1nma39g4x7cwvj009awxckjf3z2vkwhldgka44hqj72g2")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs (("rust-windows-sys" ,rust-windows-sys-0.48)))) + `(#:cargo-inputs (("rust-windows-sys" ,rust-windows-sys-0.52)))) (home-page "https://github.com/rust-cli/anstyle") (synopsis "Look up colored console capabilities") (description "Look up colored console capabilities") @@ -1799,6 +2065,31 @@ text to a terminal.") writing colored text to a terminal.") (license (list license:expat license:asl2.0)))) +(define-public rust-anstyle-svg-0.1 + (package + (name "rust-anstyle-svg") + (version "0.1.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "anstyle-svg" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0yi8d0cv1spcisch35b1f7q7lz7j7yyircrnvgaxcj5l8zadlvcb")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; Tests segfault. + #:cargo-inputs (("rust-anstream" ,rust-anstream-0.6) + ("rust-anstyle" ,rust-anstyle-1) + ("rust-anstyle-lossy" ,rust-anstyle-lossy-1) + ("rust-html-escape" ,rust-html-escape-0.2) + ("rust-unicode-width" ,rust-unicode-width-0.1)) + #:cargo-development-inputs (("rust-snapbox" ,rust-snapbox-0.5)))) + (home-page "https://github.com/rust-cli/anstyle") + (synopsis "Convert ANSI escape codes to SVG") + (description "Convert ANSI escape codes to SVG.") + (license (list license:expat license:asl2.0)))) + (define-public rust-antidote-1 (package (name "rust-antidote") @@ -1823,14 +2114,14 @@ writing colored text to a terminal.") (define-public rust-anyhow-1 (package (name "rust-anyhow") - (version "1.0.79") + (version "1.0.86") (source (origin (method url-fetch) (uri (crate-uri "anyhow" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1ji5irqiwr8yprgqj8zvnli7zd7fz9kzaiddq44jnrl2l289h3h8")))) + (base32 "1nk301x8qhpdaks6a9zvcp7yakjqnczjmqndbg7vk4494d3d1ldk")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -1855,22 +2146,141 @@ writing colored text to a terminal.") (origin (method url-fetch) (uri (crate-uri "anymap" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "0i23vv38i22aazp5z2hz0a44b943b6w5121kwwnpq1brpm1l559k")))) + (base32 "0i23vv38i22aazp5z2hz0a44b943b6w5121kwwnpq1brpm1l559k")))) (build-system cargo-build-system) - (arguments `(#:skip-build? #t)) - (home-page - "https://github.com/chris-morgan/anymap") - (synopsis - "Safe and convenient store for one value of each type") + (arguments + `(#:tests? #f)) ; cannot transmute between types of different sizes + (home-page "https://github.com/chris-morgan/anymap") + (synopsis "Safe and convenient store for one value of each type") (description "This package provides a safe and convenient store for one value of each type.") (license (list license:expat license:asl2.0)))) +(define-public rust-anymap2-0.13 + (package + (name "rust-anymap2") + (version "0.13.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "anymap2" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "031kw3bp0zh2pn9fcayaw0w0gydgpgfhm08pg4yz5cml9jwv60fk")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f)) ; cannot transmute between types of different sizes + (home-page "https://github.com/azriel91/anymap2") + (synopsis "Safe and convenient store for one value of each type") + (description + "This package provides a safe and convenient store for one value of +each type.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-apache-avro-0.16 + (package + (name "rust-apache-avro") + (version "0.16.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "apache-avro" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "180113hv4b7dw63szi5rzjb5pj8lwn5zyf8fnxq0kx7qna1wddyf")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-apache-avro-derive" ,rust-apache-avro-derive-0.16) + ("rust-bzip2" ,rust-bzip2-0.4) + ("rust-crc32fast" ,rust-crc32fast-1) + ("rust-digest" ,rust-digest-0.10) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-libflate" ,rust-libflate-2) + ("rust-log" ,rust-log-0.4) + ("rust-num-bigint" ,rust-num-bigint-0.4) + ("rust-quad-rand" ,rust-quad-rand-0.2) + ("rust-rand" ,rust-rand-0.8) + ("rust-regex-lite" ,rust-regex-lite-0.1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-snap" ,rust-snap-1) + ("rust-strum" ,rust-strum-0.25) + ("rust-strum-macros" ,rust-strum-macros-0.25) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-typed-builder" ,rust-typed-builder-0.16) + ("rust-uuid" ,rust-uuid-1) + ("rust-xz2" ,rust-xz2-0.1) + ("rust-zstd" ,rust-zstd-0.12)) + #:cargo-development-inputs + (("rust-anyhow" ,rust-anyhow-1) + ("rust-apache-avro-test-helper" ,rust-apache-avro-test-helper-0.16) + ("rust-criterion" ,rust-criterion-0.5) + ("rust-hex-literal" ,rust-hex-literal-0.4) + ("rust-md-5" ,rust-md-5-0.10) + ("rust-pretty-assertions" ,rust-pretty-assertions-1) + ("rust-serial-test" ,rust-serial-test-2) + ("rust-sha2" ,rust-sha2-0.10)))) + (home-page "https://github.com/apache/avro") + (synopsis "Library for working with Apache Avro in Rust") + (description + "This package provides a library for working with Apache Avro in Rust.") + (license license:asl2.0))) + +(define-public rust-apache-avro-derive-0.16 + (package + (name "rust-apache-avro-derive") + (version "0.16.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "apache-avro-derive" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "192wmrzjz1bwfiwv11979kk3dl51q50vgppn2iyph8v9048y85z3")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; use of undeclared crate or module `apache_avro` + #:cargo-inputs (("rust-darling" ,rust-darling-0.20) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-syn" ,rust-syn-2)) + #:cargo-development-inputs (("rust-proptest" ,rust-proptest-1) + ("rust-serde" ,rust-serde-1)))) + (home-page "https://github.com/apache/avro") + (synopsis "Library for deriving Avro schemata from Rust structs and enums") + (description "This package provides a library for deriving Avro schemata +from Rust structs and enums.") + (license license:asl2.0))) + +(define-public rust-apache-avro-test-helper-0.16 + (package + (name "rust-apache-avro-test-helper") + (version "0.16.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "apache-avro-test-helper" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1mgj73sli4m49frp4y460p7sxpkc73f00n5rqcbby4sh5fdqh9hf")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-anyhow" ,rust-anyhow-1) + ("rust-color-backtrace" ,rust-color-backtrace-0.5) + ("rust-ctor" ,rust-ctor-0.2) + ("rust-env-logger" ,rust-env-logger-0.10) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-log" ,rust-log-0.4) + ("rust-ref-thread-local" ,rust-ref-thread-local-0.1)))) + (home-page "https://github.com/apache/avro") + (synopsis "Apache Avro tests helper") + (description "This package contains the Apache Avro tests helper.") + (license license:asl2.0))) + (define-public rust-app-dirs2-2 (package (name "rust-app-dirs2") @@ -1966,8 +2376,7 @@ last place (ULPs) comparisons.") (base32 "1hx580xjdxl3766js9b49rnbnmr8gw8c060809l43k9f0xshprph")))) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-num-complex" ,rust-num-complex-0.2) ("rust-num-traits" ,rust-num-traits-0.2)))))) @@ -1990,18 +2399,18 @@ last place (ULPs) comparisons.") (define-public rust-arbitrary-1 (package (name "rust-arbitrary") - (version "1.3.0") + (version "1.3.2") (source (origin (method url-fetch) (uri (crate-uri "arbitrary" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0km5cj0sxfzv863blfjpz49mlikaxbaslyzk463i9jn1fgzril72")))) + "0471f0c4f1bgibhyhf8vnapkp158h1nkrzx0wnq97jwd9n0jcnkx")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs - (("rust-derive-arbitrary" ,rust-derive-arbitrary-1)))) + `(#:cargo-inputs (("rust-derive-arbitrary" ,rust-derive-arbitrary-1)) + #:cargo-development-inputs (("rust-exhaustigen" ,rust-exhaustigen-0.1)))) (home-page "https://github.com/rust-fuzz/arbitrary") (synopsis "Trait for generating structured data from unstructured data") (description @@ -2031,8 +2440,42 @@ coverage-guided, mutation-based fuzzers.") #:cargo-inputs (("rust-derive-arbitrary" ,rust-derive-arbitrary-0.4)))))) +(define-public rust-arboard-3 + (package + (name "rust-arboard") + (version "3.3.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "arboard" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0n7s54yjbv3qksq2fivcdnvriplmzp8fd14dfrw7k7048cciy152")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; tests require X11 $DISPLAY + #:cargo-inputs (("rust-clipboard-win" ,rust-clipboard-win-5) + ("rust-core-graphics" ,rust-core-graphics-0.23) + ("rust-image" ,rust-image-0.24) + ("rust-log" ,rust-log-0.4) + ("rust-objc" ,rust-objc-0.2) + ("rust-objc-foundation" ,rust-objc-foundation-0.1) + ("rust-objc-id" ,rust-objc-id-0.1) + ("rust-parking-lot" ,rust-parking-lot-0.12) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-windows-sys" ,rust-windows-sys-0.48) + ("rust-wl-clipboard-rs" ,rust-wl-clipboard-rs-0.8) + ("rust-x11rb" ,rust-x11rb-0.13)) + #:cargo-development-inputs (("rust-env-logger" ,rust-env-logger-0.9)))) + (home-page "https://github.com/1Password/arboard") + (synopsis "Image and text handling for the OS clipboard") + (description + "This package provides image and text handling for the OS clipboard.") + (license (list license:expat license:asl2.0)))) + (define-public rust-arboard-1 (package + (inherit rust-arboard-3) (name "rust-arboard") (version "1.2.1") (source @@ -2042,7 +2485,6 @@ coverage-guided, mutation-based fuzzers.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "1a5qfmpzcf5rwlwsligf9z1gzndpvj0jncc4s3k3z5g214c4l127")))) - (build-system cargo-build-system) (arguments `(#:cargo-test-flags '("--release" "--" @@ -2064,12 +2506,7 @@ coverage-guided, mutation-based fuzzers.") ("rust-x11rb" ,rust-x11rb-0.8)) #:cargo-development-inputs (("rust-env-logger" ,rust-env-logger-0.8) - ("rust-simple-logger" ,rust-simple-logger-1)))) - (home-page "https://github.com/ArturKovacs/arboard") - (synopsis "Image and text handling for the OS clipboard") - (description - "This package provides image and text handling for the OS clipboard.") - (license (list license:expat license:asl2.0)))) + ("rust-simple-logger" ,rust-simple-logger-1)))))) (define-public rust-arc-swap-1 (package @@ -2291,23 +2728,59 @@ CLI parser, like @code{rust-clap}, by pre-processing the arguments, like too long errors.") (license (list license:expat license:asl2.0)))) +(define-public rust-argminmax-0.6 + (package + (name "rust-argminmax") + (version "0.6.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "argminmax" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1alfp2wfh3pms6f5fj8qw9birndgac2jd2shdl2xascxsrclnhjj")) + (modules '((guix build utils))) + (snippet + '(begin (substitute* "Cargo.toml" + (("\"=([[:digit:]]+(\\.[[:digit:]]+)*)" _ version) + (string-append "\"^" version))))))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t ; `#![feature]` may not be used on the stable release channel + #:cargo-inputs (("rust-arrow" ,rust-arrow-5) + ("rust-arrow2" ,rust-arrow2-0.7) + ("rust-half" ,rust-half-2) + ("rust-ndarray" ,rust-ndarray-0.15) + ("rust-num-traits" ,rust-num-traits-0.2)) + #:cargo-development-inputs + (("rust-codspeed-criterion-compat" ,rust-codspeed-criterion-compat-2) + ("rust-criterion" ,rust-criterion-0.5) + ("rust-rand" ,rust-rand-0.8) + ("rust-rstest" ,rust-rstest-0.18) + ("rust-rstest-reuse" ,rust-rstest-reuse-0.6)))) + (home-page "https://github.com/jvdd/argminmax") + (synopsis + "ArgMinMax (argmin & argmax in 1 function) with SIMD for floats and integers") + (description + "@code{ArgMinMax} (argmin & argmax in 1 function) with SIMD for floats and +integers.") + (license license:expat))) + (define-public rust-ariadne-0.1 (package (name "rust-ariadne") - (version "0.1.6") + (version "0.1.5") (source (origin (method url-fetch) (uri (crate-uri "ariadne" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1dhxrhqgdwbl7v03m29zv4rb2fvjgw8a82lybp5xhzjp97khkm83")))) + "0303ig5g2v2xzhyzkis0nph2v21441vzalamhxgcxa5y8qh2mjzi")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-concolor" ,rust-concolor-0.0.11) - ("rust-unicode-width" ,rust-unicode-width-0.1) - ("rust-yansi" ,rust-yansi-0.5)))) + (("rust-yansi" ,rust-yansi-0.5)))) (home-page "https://github.com/zesterer/ariadne") (synopsis "Fancy diagnostics & reporting crate") (description "This package provides a fancy diagnostics & reporting crate.") @@ -2379,6 +2852,24 @@ initialisers. Provides an init closure that's called for each element of the array.") (license (list license:expat license:asl2.0)))) +(define-public rust-array-init-cursor-0.2 + (package + (name "rust-array-init-cursor") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "array-init-cursor" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0xpbqf7qkvzplpjd7f0wbcf2n1v9vygdccwxkd1amxp4il0hlzdz")))) + (build-system cargo-build-system) + (home-page "https://github.com/planus-org/planus") + (synopsis "Utility crate to help keep track of arrays of MaybeUninit") + (description + "Utility crate to help keep track of arrays of @code{MaybeUninit}.") + (license (list license:expat license:asl2.0)))) + (define-public rust-array-macro-1 (package (name "rust-array-macro") @@ -2391,7 +2882,6 @@ array.") (sha256 (base32 "19mdx2xlppnqwl6rhsbzylx61a0kkp2ql8q16195b7iga977ps86")))) (build-system cargo-build-system) - (arguments `(#:skip-build? #t)) (home-page "https://gitlab.com/KonradBorowski/array-macro") (synopsis "Array multiple elements constructor syntax") (description "This package implements constructor syntax for arrays with @@ -2489,8 +2979,7 @@ ArrayVec and ArrayString.") (base32 "12q6hn01x5435bprwlb7w9m7817dyfq55yrl4psygr78bp32zdi3")))) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-serde" ,rust-serde-1)) #:cargo-development-inputs (("rust-bencher" ,rust-bencher-0.1) @@ -2512,8 +3001,7 @@ ArrayVec and ArrayString.") (base32 "1fdiv5m627gh6flp4mpmi1mh647imm9x423licsr11psz97d97yd")))) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-nodrop" ,rust-nodrop-0.1) ("rust-serde" ,rust-serde-1)) #:cargo-development-inputs @@ -2671,6 +3159,35 @@ concrete implementations of each type, as well as an @code{Array} trait that can be used for type-erasure.") (license license:asl2.0))) +(define-public rust-arrow-array-43 + (package + (inherit rust-arrow-array-47) + (name "rust-arrow-array") + (version "43.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "arrow-array" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1l7k48p40b8j4nzda5z20b45zsaphm9yylzwryr8n7vxbxrfmmv3")))) + (arguments + `(#:cargo-test-flags + '("--release" "--" + "--skip=array::binary_array::tests::test_binary_array_from_incorrect_list_array") + #:cargo-inputs (("rust-ahash" ,rust-ahash-0.8) + ("rust-arrow-buffer" ,rust-arrow-buffer-43) + ("rust-arrow-data" ,rust-arrow-data-43) + ("rust-arrow-schema" ,rust-arrow-schema-43) + ("rust-chrono" ,rust-chrono-0.4) + ("rust-chrono-tz" ,rust-chrono-tz-0.8) + ("rust-half" ,rust-half-2) + ("rust-hashbrown" ,rust-hashbrown-0.14) + ("rust-num" ,rust-num-0.4) + ("rust-packed-simd-2" ,rust-packed-simd-2-0.3)) + #:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.5) + ("rust-rand" ,rust-rand-0.8)))))) + (define-public rust-arrow-buffer-47 (package (name "rust-arrow-buffer") @@ -2697,6 +3214,24 @@ can be used for type-erasure.") Rust implementation of Apache Arrow.") (license license:asl2.0))) +(define-public rust-arrow-buffer-43 + (package + (inherit rust-arrow-buffer-47) + (name "rust-arrow-buffer") + (version "43.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "arrow-buffer" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "08m7cxfksmc2qsygba0ingr1a3acbrxx9qdr0184wj3z0yg47gmx")))) + (arguments + `(#:cargo-inputs (("rust-half" ,rust-half-2) + ("rust-num" ,rust-num-0.4)) + #:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.5) + ("rust-rand" ,rust-rand-0.8)))))) + (define-public rust-arrow-cast-47 (package (name "rust-arrow-cast") @@ -2818,8 +3353,51 @@ Arrow memory format and CSV line-delimited records.") the Apache Arrow implementation in Rust.") (license license:asl2.0))) +(define-public rust-arrow-data-43 + (package + (inherit rust-arrow-data-47) + (name "rust-arrow-data") + (version "43.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "arrow-data" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "12q2dvfaj78rfj5k3sfn8d3fnhwp3iizd4dbf5m14526qniz9x6l")))) + (arguments + `(#:cargo-inputs (("rust-arrow-buffer" ,rust-arrow-buffer-43) + ("rust-arrow-schema" ,rust-arrow-schema-43) + ("rust-half" ,rust-half-2) + ("rust-num" ,rust-num-0.4)))))) + +(define-public rust-arrow-format-0.8 + (package + (name "rust-arrow-format") + (version "0.8.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "arrow-format" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1irj67p6c224dzw86jr7j3z9r5zfid52gy6ml8rdqk4r2si4x207")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-planus" ,rust-planus-0.3) + ("rust-prost" ,rust-prost-0.11) + ("rust-prost-derive" ,rust-prost-derive-0.11) + ("rust-serde" ,rust-serde-1) + ("rust-tonic" ,rust-tonic-0.8)))) + (home-page "https://github.com/DataEngineeringLabs/arrow-format") + (synopsis "Unofficial flatbuffers and tonic code of Apache Arrow spec") + (description "This package provides an nofficial flatbuffers and tonic +code of Apache Arrow spec.") + (license license:asl2.0))) + (define-public rust-arrow-format-0.3 (package + (inherit rust-arrow-format-0.8) (name "rust-arrow-format") (version "0.3.0") (source @@ -2829,19 +3407,13 @@ the Apache Arrow implementation in Rust.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "0apg3x3yllbazh6jr85g5yammjqxpnrk6jm4n2yypyhbcvcs4zcz")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-flatbuffers" ,rust-flatbuffers-2) ("rust-prost" ,rust-prost-0.9) ("rust-prost-derive" ,rust-prost-derive-0.9) - ("rust-tonic" ,rust-tonic-0.6)))) - (home-page "https://crates.io/crates/arrow-format") - (synopsis "Unofficial flatbuffers and tonic code of Apache Arrow spec") - (description "This package provides an nofficial flatbuffers and tonic -code of Apache Arrow spec.") - (license license:asl2.0))) + ("rust-tonic" ,rust-tonic-0.6)))))) (define-public rust-arrow-ipc-47 (package @@ -3029,6 +3601,24 @@ used in non-comparison sorts such as radix sort.") Apache Arrow implementation in Rust.") (license license:asl2.0))) +(define-public rust-arrow-schema-43 + (package + (inherit rust-arrow-schema-47) + (name "rust-arrow-schema") + (version "43.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "arrow-schema" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0zp8jz0pcr2d020rrmkdkzg6yizb2gc0fbfgzddb2w7mxrbwpsrb")))) + (arguments + `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-2) + ("rust-serde" ,rust-serde-1)) + #:cargo-development-inputs (("rust-bincode" ,rust-bincode-1) + ("rust-serde-json" ,rust-serde-json-1)))))) + (define-public rust-arrow-select-47 (package (name "rust-arrow-select") @@ -3087,6 +3677,86 @@ arrays. Examples include @code{concat_elements}, @code{length}, @code{like}, @code{regexp} and @code{substring} kernels.") (license license:asl2.0))) +(define-public rust-arrow2-0.17 + (package + (name "rust-arrow2") + (version "0.17.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "arrow2" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1yh40rdx0hwyag621byl6rk8w2jzvgvsj78sg1yp82qlxbd6ii2r")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; failed to resolve: could not find `parquet` in `io` + #:cargo-inputs + (("rust-ahash" ,rust-ahash-0.8) + ("rust-arrow-array" ,rust-arrow-array-43) + ("rust-arrow-buffer" ,rust-arrow-buffer-43) + ("rust-arrow-data" ,rust-arrow-data-43) + ("rust-arrow-format" ,rust-arrow-format-0.8) + ("rust-arrow-schema" ,rust-arrow-schema-43) + ("rust-async-stream" ,rust-async-stream-0.3) + ("rust-avro-schema" ,rust-avro-schema-0.3) + ("rust-base64" ,rust-base64-0.21) + ("rust-bytemuck" ,rust-bytemuck-1) + ("rust-chrono" ,rust-chrono-0.4) + ("rust-chrono-tz" ,rust-chrono-tz-0.8) + ("rust-comfy-table" ,rust-comfy-table-6) + ("rust-csv" ,rust-csv-1) + ("rust-csv-async" ,rust-csv-async-1) + ("rust-csv-core" ,rust-csv-core-0.1) + ("rust-dyn-clone" ,rust-dyn-clone-1) + ("rust-either" ,rust-either-1) + ("rust-ethnum" ,rust-ethnum-1) + ("rust-fallible-streaming-iterator" ,rust-fallible-streaming-iterator-0.1) + ("rust-foreign-vec" ,rust-foreign-vec-0.1) + ("rust-futures" ,rust-futures-0.3) + ("rust-getrandom" ,rust-getrandom-0.2) + ("rust-hash-hasher" ,rust-hash-hasher-2) + ("rust-hashbrown" ,rust-hashbrown-0.13) + ("rust-hex" ,rust-hex-0.4) + ("rust-indexmap" ,rust-indexmap-1) + ("rust-itertools" ,rust-itertools-0.10) + ("rust-json-deserializer" ,rust-json-deserializer-0.4) + ("rust-lexical-core" ,rust-lexical-core-0.8) + ("rust-lz4" ,rust-lz4-1) + ("rust-multiversion" ,rust-multiversion-0.7) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-odbc-api" ,rust-odbc-api-0.36) + ("rust-orc-format" ,rust-orc-format-0.3) + ("rust-parquet2" ,rust-parquet2-0.17) + ("rust-rand" ,rust-rand-0.8) + ("rust-regex" ,rust-regex-1) + ("rust-regex-syntax" ,rust-regex-syntax-0.6) + ("rust-rustc-version" ,rust-rustc-version-0.4) + ("rust-serde" ,rust-serde-1) + ("rust-serde-derive" ,rust-serde-derive-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-simdutf8" ,rust-simdutf8-0.1) + ("rust-streaming-iterator" ,rust-streaming-iterator-0.1) + ("rust-strength-reduce" ,rust-strength-reduce-0.2) + ("rust-zstd" ,rust-zstd-0.12)) + #:cargo-development-inputs + (("rust-avro-rs" ,rust-avro-rs-0.13) + ("rust-criterion" ,rust-criterion-0.4) + ("rust-crossbeam-channel" ,rust-crossbeam-channel-0.5) + ("rust-doc-comment" ,rust-doc-comment-0.3) + ("rust-flate2" ,rust-flate2-1) + ("rust-proptest" ,rust-proptest-1) + ("rust-rand" ,rust-rand-0.8) + ("rust-sample-arrow2" ,rust-sample-arrow2-0.1) + ("rust-sample-std" ,rust-sample-std-0.1) + ("rust-sample-test" ,rust-sample-test-0.1) + ("rust-tokio" ,rust-tokio-1) + ("rust-tokio-util" ,rust-tokio-util-0.7)))) + (home-page "https://github.com/jorgecarleitao/arrow2") + (synopsis "Unofficial implementation of Apache Arrow spec in safe Rust") + (description "Unofficial implementation of Apache Arrow spec in safe Rust.") + (license license:asl2.0))) + (define-public rust-arrow2-0.7 (package (name "rust-arrow2") @@ -3178,8 +3848,39 @@ the web.") ;; No copyright headers in the source code. LICENSE indicates gpl3. (license license:gpl3))) +(define-public rust-as-derive-utils-0.11 + (package + (name "rust-as-derive-utils") + (version "0.11.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "as_derive_utils" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1i2kwzxdhydicj9bqscz5w73nmx612yi3ha137qlr900b5j9cg7z")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; Only doc tests, which fail. + #:cargo-inputs (("rust-aho-corasick" ,rust-aho-corasick-0.7) + ("rust-bitflags" ,rust-bitflags-1) + ("rust-core-extensions" ,rust-core-extensions-1) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-regex" ,rust-regex-1) + ("rust-ron" ,rust-ron-0.7) + ("rust-serde" ,rust-serde-1) + ("rust-serde-derive" ,rust-serde-derive-1) + ("rust-syn" ,rust-syn-1)))) + (home-page "https://github.com/rodrimati1992/abi_stable_crates/") + (synopsis "Private derive utilities used by abi_stable and structural") + (description "This package contains private derive utilities used by +the abi_stable and structural crates.") + (license (list license:expat license:asl2.0)))) + (define-public rust-as-derive-utils-0.10 (package + (inherit rust-as-derive-utils-0.11) (name "rust-as-derive-utils") (version "0.10.3") (source @@ -3196,7 +3897,6 @@ the web.") " <([[:digit:]]+\\.[[:digit:]]+\\.[[:digit:]]+)") _ version _) (string-append ">=" version))))))) - (build-system cargo-build-system) (arguments `(#:tests? #f ; Only doc tests, which fail. #:cargo-inputs @@ -3209,12 +3909,7 @@ the web.") ("rust-ron" ,rust-ron-0.6) ("rust-serde" ,rust-serde-1) ("rust-serde-derive" ,rust-serde-derive-1) - ("rust-syn" ,rust-syn-1)))) - (home-page "https://github.com/rodrimati1992/abi_stable_crates/") - (synopsis "Private derive utilities used by abi_stable and structural") - (description "This package contains private derive utilities used by -the abi_stable and structural crates.") - (license (list license:expat license:asl2.0)))) + ("rust-syn" ,rust-syn-1)))))) (define-public rust-as-derive-utils-0.8 (package @@ -3246,6 +3941,25 @@ the abi_stable and structural crates.") ("rust-serde-derive" ,rust-serde-derive-1) ("rust-syn" ,rust-syn-1)))))) +(define-public rust-as-variant-1 + (package + (name "rust-as-variant") + (version "1.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "as_variant" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "13vryhfcslf50f8j1msnxg5689bzwz56z45dgzxqd7r40wis53zk")))) + (build-system cargo-build-system) + (home-page "https://github.com/jplatte/as_variant") + (synopsis "Macro to convert enums with newtype variants to Option") + (description + "This package provides a simple macro to convert enums with newtype +variants to `Option`s.") + (license license:mpl2.0))) + (define-public rust-asio-sys-0.2 (package (name "rust-asio-sys") @@ -3561,7 +4275,10 @@ standard library.") (base32 "051gh2bgjq90s0f0i0hd9p4z4fpg5k82b570d1223jj7rhd8kglp")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t + `(#:cargo-test-flags + '("--release" "--" + "--skip=src/ascii_char.rs - ascii_char::AsciiChar::from (line 296)" + "--skip=src/ascii_string.rs - ascii_string::AsciiString::pop (line 259)") #:cargo-inputs (("rust-quickcheck" ,rust-quickcheck-0.4)))))) @@ -3577,7 +4294,6 @@ standard library.") (sha256 (base32 "0jpp550pwi38msflpy7lnqm2r153kn9k19bss6k9ak9yacq8z4vi")))) (build-system cargo-build-system) - (arguments `(#:skip-build? #t)) (home-page "https://github.com/tredoe/ascii_utils") (synopsis "Utilities to handle ASCII characters") (description @@ -3587,16 +4303,15 @@ standard library.") (define-public rust-assert-0.7 (package (name "rust-assert") - (version "0.7.4") + (version "0.7.5") (source (origin (method url-fetch) (uri (crate-uri "assert" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1hnph97yz3hpf71s4rdzcrgd492d1m7rj0k48ymxl1w5d2g8v450")))) + (base32 "1fxwnw8ypr6i6bxsy4ggzpjb70aysl044nfzyl3q8kyyv25zqisn")))) (build-system cargo-build-system) - (arguments `(#:skip-build? #t)) (home-page "https://github.com/stainless-steel/assert") (synopsis "Assertions for testing") (description "This package provides assertions for testing.") @@ -3614,7 +4329,6 @@ standard library.") (sha256 (base32 "1zagfwfad5wssmr830gk3489f97ppczv6xs627jxniwm6ssdl1rw")))) (build-system cargo-build-system) - (arguments '(#:skip-build? #t)) (home-page "https://github.com/ashleygwilliams/assert_approx_eq") (synopsis "Assert approximately equal") (description @@ -3654,18 +4368,18 @@ approximately equal.") (define-public rust-assert-cmd-2 (package (name "rust-assert-cmd") - (version "2.0.12") + (version "2.0.14") (source (origin (method url-fetch) (uri (crate-uri "assert_cmd" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1rnzd84nqijp147nld05j5j92xpj2j57zfrm6c0d9r138yqkr448")))) + (base32 "1a3k03dl57psaky6brb53awzmgbjdivb62j8gy1h8n3dqqx4jwpd")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-anstream" ,rust-anstream-0.3) + (("rust-anstream" ,rust-anstream-0.6) ("rust-anstyle" ,rust-anstyle-1) ("rust-bstr" ,rust-bstr-1) ("rust-doc-comment" ,rust-doc-comment-0.3) @@ -3797,6 +4511,30 @@ assertions on the result of your program's run.") (description "Macro for static assert types implement a trait or not") (license license:expat))) +(define-public rust-assert-json-diff-2 + (package + (name "rust-assert-json-diff") + (version "2.0.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "assert-json-diff" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "04mg3w0rh3schpla51l18362hsirl23q93aisws2irrj32wg5r27")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1)) + #:cargo-development-inputs + (("rust-serde" ,rust-serde-1) + ("rust-version-sync" ,rust-version-sync-0.8)))) + (home-page "https://github.com/davidpdrsn/assert-json-diff") + (synopsis "Easily compare two JSON values and get great output") + (description "This package lets you easily compare two JSON values +and get great output.") + (license license:expat))) + (define-public rust-assert-matches-1 (package (name "rust-assert-matches") @@ -4031,6 +4769,37 @@ multi-consumer channels.") (("rust-easy-parallel" ,rust-easy-parallel-3) ("rust-futures-lite" ,rust-futures-lite-1)))))) +(define-public rust-async-compat-0.2 + (package + (name "rust-async-compat") + (version "0.2.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "async-compat" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "06s625ydwms36y4sn723mwq7s4bba2gmp9pq0y65s2gb3xy712pn")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-futures-core" ,rust-futures-core-0.3) + ("rust-futures-io" ,rust-futures-io-0.3) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-pin-project-lite" ,rust-pin-project-lite-0.2) + ("rust-tokio" ,rust-tokio-1)) + #:cargo-development-inputs (("rust-blocking" ,rust-blocking-1) + ("rust-futures" ,rust-futures-0.3) + ("rust-reqwest" ,rust-reqwest-0.11) + ("rust-tokio" ,rust-tokio-1) + ("rust-warp" ,rust-warp-0.3)))) + (native-inputs (list pkg-config)) + (inputs (list openssl)) + (home-page "https://github.com/smol-rs/async-compat") + (synopsis "Compatibility adapter between tokio and futures") + (description + "This package provides compatibility adapter between tokio and futures.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-async-compression-0.4 (package (name "rust-async-compression") @@ -4123,7 +4892,6 @@ and Rust's modern asynchronous IO types.") (sha256 (base32 "0k4kiy67d24ay8l7xrfjpsa4zkmhxv97ddj0f16rcv61qkky3i4f")))) (build-system cargo-build-system) - (arguments `(#:skip-build? #t)) (home-page "https://github.com/rustasync/async-datagram") (synopsis "Async datagram traits") (description "This package provides asynchronous datagram traits.") @@ -4601,6 +5369,29 @@ managing processes both synchronously (via the PidFd type) and asynchronously (via the AsyncPidFd type).") (license (list license:expat license:asl2.0)))) +(define-public rust-async-priority-channel-0.1 + (package + (name "rust-async-priority-channel") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "async-priority-channel" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0h36m0avgs86pgh286xkvbnhdhb8bxgsnlxwwazvw88v5scph5n2")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-event-listener" ,rust-event-listener-2)) + #:cargo-development-inputs (("rust-futures-lite" ,rust-futures-lite-1) + ("rust-tokio" ,rust-tokio-1)))) + (home-page "https://github.com/rmcgibbo/async-priority-channel") + (synopsis "Async channel with message delivery by priority") + (description + "This package provides an async channel where pending messages are +delivered in order of priority.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-async-process-1 (package (name "rust-async-process") @@ -4690,6 +5481,38 @@ futures.") (description "This package provides recursion for async functions in Rust.") (license (list license:expat license:asl2.0)))) +(define-public rust-async-session-3 + (package + (name "rust-async-session") + (version "3.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "async-session" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0c76vazdlcs2rsxq8gd8a6wnb913vxhnfx1hyfmfpqml4gjlrnh7")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-anyhow" ,rust-anyhow-1) + ("rust-async-lock" ,rust-async-lock-2) + ("rust-async-trait" ,rust-async-trait-0.1) + ("rust-base64" ,rust-base64-0.13) + ("rust-bincode" ,rust-bincode-1) + ("rust-blake3" ,rust-blake3-0.3) + ("rust-chrono" ,rust-chrono-0.4) + ("rust-hmac" ,rust-hmac-0.11) + ("rust-log" ,rust-log-0.4) + ("rust-rand" ,rust-rand-0.8) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-sha2" ,rust-sha2-0.9)) + #:cargo-development-inputs (("rust-async-std" ,rust-async-std-1)))) + (home-page "https://github.com/http-rs/async-session") + (synopsis "Async session support with pluggable middleware") + (description "Async session support with pluggable middleware.") + (license (list license:expat license:asl2.0)))) + (define-public rust-async-signal-0.2 (package (name "rust-async-signal") @@ -5004,6 +5827,42 @@ methods.") (description "Parse integers directly from `[u8]` slices in safe code.") (license license:expat))) +(define-public rust-atoi-0.4 + (package + (inherit rust-atoi-2) + (name "rust-atoi") + (version "0.4.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "atoi" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "19fdm7gxwp98y67ghyis841vy5ka7hc1afm9cfa69qn0bzh9cs31")))) + (arguments + `(#:cargo-inputs (("rust-num-traits" ,rust-num-traits-0.2)) + #:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.3)))))) + +(define-public rust-atoi-simd-0.15 + (package + (name "rust-atoi-simd") + (version "0.15.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "atoi_simd" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1a98kvaqyhb1shi2c6qhvklahc7ckvpmibcy319i6g1i9xqkgq4s")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-development-inputs (("rust-arrayvec" ,rust-arrayvec-0.7) + ("rust-numtoa" ,rust-numtoa-0.2)))) + (home-page "https://github.com/RoDmitry/atoi_simd") + (synopsis "Fast @code{&[u8]} to integer parser") + (description "This package provides a fast @code{&[u8]} to integer parser.") + (license (list license:expat license:asl2.0)))) + (define-public rust-atom-0.3 (package (name "rust-atom") @@ -5103,6 +5962,25 @@ they're not available.") they're not available.") (license (list license:expat license:asl2.0)))) +(define-public rust-atomic-take-1 + (package + (name "rust-atomic-take") + (version "1.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "atomic-take" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1hzvfqiy0ixsawkh7ci9visn95kx2j6yvnqxz536x5wpzranpax8")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-development-inputs (("rust-tokio" ,rust-tokio-1)))) + (home-page "https://github.com/Darksonn/atomic-take") + (synopsis "Atomically take a value out of a container once") + (description "Atomically take a value out of a container once.") + (license license:expat))) + (define-public rust-atomic-write-file-0.1 (package (name "rust-atomic-write-file") @@ -5162,7 +6040,7 @@ they're not available.") "1s7yslcs6a28c5vz7jwj63lkfgyx8mx99fdirlhi9lbhhzhrpcyr")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t + `(#:tests? #f ;; tests expect a tty #:cargo-inputs (("rust-hermit-abi" ,rust-hermit-abi-0.1) ("rust-libc" ,rust-libc-0.2) @@ -5372,31 +6250,31 @@ iteratively in Rust.") (define-public rust-average-0.10 (package (name "rust-average") - (version "0.10.4") + (version "0.10.6") (source (origin (method url-fetch) (uri (crate-uri "average" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1dmsxqcr1n0i20qr9g2g6j89kkx8dy6w18dbqzx1wi42wj1chgvh")))) + "1npcsgksxa8c03cam1zyxgaw9rsifwbzbflf4pjrq55b0a01cg1j")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-conv" ,rust-conv-0.3) ("rust-float-ord" ,rust-float-ord-0.2) ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-rayon" ,rust-rayon-1) ("rust-serde" ,rust-serde-1) - ("rust-serde-big-array" ,rust-serde-big-array-0.2) + ("rust-serde-big-array" ,rust-serde-big-array-0.3) ("rust-serde-derive" ,rust-serde-derive-1)) #:cargo-development-inputs (("rust-bencher" ,rust-bencher-0.1) - ("rust-proptest" ,rust-proptest-0.9) + ("rust-proptest" ,rust-proptest-0.10) ("rust-quantiles" ,rust-quantiles-0.7) ("rust-rand" ,rust-rand-0.7) - ("rust-rand-distr" ,rust-rand-distr-0.2) + ("rust-rand-distr" ,rust-rand-distr-0.3) ("rust-rand-xoshiro" ,rust-rand-xoshiro-0.4) ("rust-serde-json" ,rust-serde-json-1) ("rust-streaming-stats" ,rust-streaming-stats-0.2)))) @@ -5533,6 +6411,37 @@ film grain data.") "This package is a library for working with Apache Avro in Rust.") (license license:expat))) +(define-public rust-avro-schema-0.3 + (package + (name "rust-avro-schema") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "avro-schema" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1gbvciwvi2isa6qanbzi4lbqzzgvhdlzjyzlsa29dflsndaiha5m")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-test-flags + '("--release" "--" + "--skip=file::round_trip_deflate" + "--skip=file::round_trip_snappy") + #:cargo-inputs + (("rust-async-stream" ,rust-async-stream-0.3) + ("rust-crc" ,rust-crc-2) + ("rust-fallible-streaming-iterator" ,rust-fallible-streaming-iterator-0.1) + ("rust-futures" ,rust-futures-0.3) + ("rust-libflate" ,rust-libflate-1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-snap" ,rust-snap-1)))) + (home-page "https://github.com/DataEngineeringLabs/avro-schema") + (synopsis "Apache Avro specification") + (description "This package contains the Apache Avro specification.") + (license (list license:expat license:asl2.0)))) + (define-public rust-az-1 (package (name "rust-az") @@ -5552,6 +6461,43 @@ film grain data.") (description "This crate provides casts and checked casts.") (license (list license:expat license:asl2.0)))) +(define-public rust-backoff-0.4 + (package + (name "rust-backoff") + (version "0.4.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "backoff" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1h80d9xn5wngxdgza2m8w4x1kyhk0x6k9ydvsj50j2pcn6fdnbdn")) + (modules '((guix build utils))) + ;; XXX: Doctest hangs for no apparent reason. + (snippet '(substitute* "src/lib.rs" + (("```rust\n") + "```rust,no_run\n"))))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-async-std" ,rust-async-std-1) + ("rust-futures-core" ,rust-futures-core-0.3) + ("rust-getrandom" ,rust-getrandom-0.2) + ("rust-instant" ,rust-instant-0.1) + ("rust-pin-project-lite" ,rust-pin-project-lite-0.2) + ("rust-rand" ,rust-rand-0.8) + ("rust-tokio" ,rust-tokio-1)) + #:cargo-development-inputs + (("rust-async-std" ,rust-async-std-1) + ("rust-futures-executor" ,rust-futures-executor-0.3) + ("rust-reqwest" ,rust-reqwest-0.11) + ("rust-tokio" ,rust-tokio-1)))) + (native-inputs (list pkg-config)) + (inputs (list openssl)) + (home-page "https://github.com/ihrwein/backoff") + (synopsis "Retry operations with exponential backoff policy") + (description "Retry operations with exponential backoff policy.") + (license (list license:expat license:asl2.0)))) + (define-public rust-backon-0.4 (package (name "rust-backon") @@ -5583,27 +6529,26 @@ effort.") (define-public rust-backtrace-0.3 (package (name "rust-backtrace") - (version "0.3.67") + (version "0.3.69") (source (origin (method url-fetch) (uri (crate-uri "backtrace" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1jk48laqafvbyc0mn1v0didk307qc0zji3z5jcq2lpqqdmnkfg93")))) + "0dsq23dhw4pfndkx2nsa1ml2g31idm7ss7ljxp8d57avygivg290")))) (build-system cargo-build-system) (arguments `(#:tests? #f ; Not all files included. #:cargo-inputs - (("rust-addr2line" ,rust-addr2line-0.19) + (("rust-addr2line" ,rust-addr2line-0.21) ("rust-cc" ,rust-cc-1) ("rust-cfg-if" ,rust-cfg-if-1) ("rust-cpp-demangle" ,rust-cpp-demangle-0.4) ("rust-libc" ,rust-libc-0.2) - ("rust-miniz-oxide" ,rust-miniz-oxide-0.6) - ("rust-object" ,rust-object-0.30) + ("rust-miniz-oxide" ,rust-miniz-oxide-0.7) + ("rust-object" ,rust-object-0.32) ("rust-rustc-demangle" ,rust-rustc-demangle-0.1) ("rust-rustc-serialize" ,rust-rustc-serialize-0.3) ("rust-serde" ,rust-serde-1) @@ -5617,6 +6562,28 @@ effort.") trace (backtrace) at runtime in a Rust program.") (license (list license:asl2.0 license:expat)))) +(define-public rust-backtrace-ext-0.2 + (package + (name "rust-backtrace-ext") + (version "0.2.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "backtrace-ext" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0l4xacjnx4jrn9k14xbs2swks018mviq03sp7c1gn62apviywysk")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-backtrace" ,rust-backtrace-0.3)) + #:cargo-development-inputs (("rust-miette" ,rust-miette-5) + ("rust-thiserror" ,rust-thiserror-1)))) + (home-page "https://github.com/gankra/backtrace-ext") + (synopsis "conveniences on top of the backtrace crate") + (description + "This package provides minor conveniences on top of the backtrace crate.") + (license (list license:expat license:asl2.0)))) + (define-public rust-barrel-0.6 (package (name "rust-barrel") @@ -5685,31 +6652,54 @@ RFC4648 Base32 or in Crockford Base32.") c6e7d37. However, this package works only up to 128 bytes.") (license license:expat))) +(define-public rust-base64-0.22 + (package + (name "rust-base64") + (version "0.22.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "base64" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1imqzgh7bxcikp5vx3shqvw9j09g9ly0xr0jma0q66i52r7jbcvj")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-development-inputs + (("rust-clap" ,rust-clap-3) + ("rust-criterion" ,rust-criterion-0.4) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-rand" ,rust-rand-0.8) + ("rust-rstest" ,rust-rstest-0.13) + ("rust-rstest-reuse" ,rust-rstest-reuse-0.6) + ("rust-strum" ,rust-strum-0.25)))) + (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.21 (package + (inherit rust-base64-0.22) (name "rust-base64") - (version "0.21.5") + (version "0.21.7") (source (origin (method url-fetch) (uri (crate-uri "base64" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1y8x2xs9nszj5ix7gg4ycn5a6wy7ca74zxwqri3bdqzdjha6lqrm")))) - (build-system cargo-build-system) + "0rw52yvsk75kar9wgqfwgb414kvil1gn7mqkrhn9zf1537mpsacx")))) (arguments `(#:cargo-development-inputs - (("rust-criterion" ,rust-criterion-0.4) - ("rust-lazy-static" ,rust-lazy-static-1) + (("rust-clap" ,rust-clap-3) + ("rust-criterion" ,rust-criterion-0.4) + ("rust-once-cell" ,rust-once-cell-1) ("rust-rand" ,rust-rand-0.8) - ("rust-rstest" ,rust-rstest-0.12) - ("rust-rstest-reuse" ,rust-rstest-reuse-0.3) - ("rust-structopt" ,rust-structopt-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)))) + ("rust-rstest" ,rust-rstest-0.13) + ("rust-rstest-reuse" ,rust-rstest-reuse-0.6) + ("rust-strum" ,rust-strum-0.25)))))) (define-public rust-base64-0.20 (package @@ -6029,6 +7019,27 @@ and no more (caveat: black_box is still missing!).") (license (list license:asl2.0 license:expat)))) +(define-public rust-better-panic-0.3 + (package + (name "rust-better-panic") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "better-panic" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0djh7qs39z0mbkzxs4nrc9ngnyjpsxq67lqfv75q91i63b8y3abg")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-backtrace" ,rust-backtrace-0.3) + ("rust-console" ,rust-console-0.15) + ("rust-syntect" ,rust-syntect-4)))) + (home-page "https://github.com/mitsuhiko/better-panic") + (synopsis "Pretty panic backtraces") + (description "Pretty panic backtraces inspired by Python's tracebacks.") + (license license:expat))) + (define-public rust-bigdecimal-0.4 (package (name "rust-bigdecimal") @@ -6202,6 +7213,36 @@ 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.68 + (package + (inherit rust-bindgen-0.69) + (name "rust-bindgen") + (version "0.68.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "bindgen" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0y40gndyay1fj8d3d8gsd9fyfzjlbghx92i560kmvhvfxc9l6vkj")))) + (arguments + `(#:cargo-inputs (("rust-annotate-snippets" ,rust-annotate-snippets-0.9) + ("rust-bitflags" ,rust-bitflags-2) + ("rust-cexpr" ,rust-cexpr-0.6) + ("rust-clang-sys" ,rust-clang-sys-1) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-lazycell" ,rust-lazycell-1) + ("rust-log" ,rust-log-0.4) + ("rust-peeking-take-while" ,rust-peeking-take-while-0.1) + ("rust-prettyplease" ,rust-prettyplease-0.2) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-regex" ,rust-regex-1) + ("rust-rustc-hash" ,rust-rustc-hash-1) + ("rust-shlex" ,rust-shlex-1) + ("rust-syn" ,rust-syn-2) + ("rust-which" ,rust-which-4)))))) + (define-public rust-bindgen-0.66 (package (inherit rust-bindgen-0.69) @@ -6931,14 +7972,14 @@ types.") (define-public rust-bitflags-2 (package (name "rust-bitflags") - (version "2.4.1") + (version "2.5.0") (source (origin (method url-fetch) (uri (crate-uri "bitflags" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "01ryy3kd671b0ll4bhdvhsz67vwz1lz53fz504injrd7wpv64xrj")))) + (base32 "1h91vdx1il069vdiiissj8ymzj130rbiic0dbs77yxjgjim9sjyg")))) (build-system cargo-build-system) (arguments `(#:tests? #f ; Not all files included. @@ -7065,32 +8106,46 @@ behave like a set of bitflags.") (build-system cargo-build-system) (arguments `(#:skip-build? #t)))) -(define-public rust-bitmaps-2 +(define-public rust-bitmaps-3 (package (name "rust-bitmaps") - (version "2.1.0") + (version "3.2.1") (source (origin (method url-fetch) (uri (crate-uri "bitmaps" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "18k4mcwxl96yvii5kcljkpb8pg5j4jj1zbsdn26nsx4r83846403")))) + (base32 "1mivd3wyyham6c8y21nq3ka29am6v8hqn7lzmwf91aks2fq89l51")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs - (("rust-typenum" ,rust-typenum-1)) - #:cargo-development-inputs - (("rust-proptest" ,rust-proptest-0.9) - ("rust-proptest-derive" ,rust-proptest-derive-0.1)))) + `(#:cargo-development-inputs + (("rust-proptest" ,rust-proptest-1) + ("rust-proptest-derive" ,rust-proptest-derive-0.4)))) (home-page "https://github.com/bodil/bitmaps") (synopsis "Fixed size compact boolean array in Rust") (description "This crate provides a convenient and efficient way of declaring and working with fixed size bitmaps in Rust.") (license license:mpl2.0))) +(define-public rust-bitmaps-2 + (package + (inherit rust-bitmaps-3) + (name "rust-bitmaps") + (version "2.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "bitmaps" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "18k4mcwxl96yvii5kcljkpb8pg5j4jj1zbsdn26nsx4r83846403")))) + (arguments + `(#:cargo-inputs (("rust-typenum" ,rust-typenum-1)) + #:cargo-development-inputs + (("rust-proptest" ,rust-proptest-0.9) + ("rust-proptest-derive" ,rust-proptest-derive-0.1)))))) + (define-public rust-bitpacking-0.8 (package (name "rust-bitpacking") @@ -7140,15 +8195,17 @@ the buffer.") (define-public rust-bitstream-io-2 (package (name "rust-bitstream-io") - (version "2.2.0") + (version "2.3.0") (source (origin (method url-fetch) (uri (crate-uri "bitstream-io" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1nkny66c4hagpc6l656jvvlnz212msv6icca0f0jw7hpa6d9ij86")))) + (base32 "0vj4f4kg3ls3j41180a7ia65rj2p762mbzimm0bxiw22ds2x24kw")))) (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-core2" ,rust-core2-0.4)))) (home-page "https://github.com/tuffy/bitstream-io") (synopsis "Read/write un-aligned values from big or little-endian streams") (description @@ -7160,15 +8217,14 @@ streams in big-endian and little-endian formats.") (package (inherit rust-bitstream-io-2) (name "rust-bitstream-io") - (version "1.0.0") + (version "1.10.0") (source (origin (method url-fetch) (uri (crate-uri "bitstream-io" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "01pyk3pipwcbaghi7f0lmp3izjl902cv21yf4b1v5nipkrrrqlq3")))) - (arguments `(#:skip-build? #t)))) + (base32 "0kq7hgc66pkbg9kwp8qazaz5x0dagaihml6b8ixsa17xb5k5fig4")))))) (define-public rust-bitstream-io-0.8 (package @@ -7235,7 +8291,7 @@ streams in big-endian and little-endian formats.") (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-funty" ,rust-funty-1) + (("rust-funty" ,rust-funty-1.2.0-yanked) ; Specifically ~1.2 ("rust-radium" ,rust-radium-0.6) ("rust-serde" ,rust-serde-1) ("rust-tap" ,rust-tap-1) @@ -7267,8 +8323,11 @@ streams in big-endian and little-endian formats.") (base32 "0j3qn0z31j06c965hs3kh41l78hxbzzsf1h46xvs3ym48i1i8x3p")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs - (("rust-funty" ,rust-funty-1.1) + `(#:cargo-test-flags + '("--release" "--" + "--skip=slice::tests::get_set") + #:cargo-inputs + (("rust-funty" ,rust-funty-1) ("rust-radium" ,rust-radium-0.6) ("rust-serde" ,rust-serde-1) ("rust-tap" ,rust-tap-1) @@ -7295,7 +8354,7 @@ streams in big-endian and little-endian formats.") (base32 "0cvb24nanb50vq61d3ac3pz7rxjcy0w6lr3nb56kcg1nyc73vyam")))) (arguments `(#:cargo-inputs - (("rust-funty" ,rust-funty-1.1) + (("rust-funty" ,rust-funty-1) ("rust-radium" ,rust-radium-0.5) ("rust-serde" ,rust-serde-1) ("rust-tap" ,rust-tap-1) @@ -7347,6 +8406,35 @@ streams in big-endian and little-endian formats.") (description "The package provides wrappers for BLAS (Fortran).") (license (list license:asl2.0 license:expat)))) +(define-public rust-blanket-0.3 + (package + (name "rust-blanket") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "blanket" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1zvffm82h5825lcf9c0xy76mj487il472cpvcbiidy8dzslj3cg0")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; Tests fail to compile. + #:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-2)) + #:cargo-development-inputs + (("rust-impls" ,rust-impls-1) + ("rust-static-assertions" ,rust-static-assertions-1) + ("rust-syn" ,rust-syn-2) + ("rust-trybuild" ,rust-trybuild-1)))) + (home-page "https://github.com/althonos/blanket") + (synopsis "Macro to derive blanket implementations for your traits") + (description + "This package provides a simple macro to derive blanket implementations for +your traits.") + (license license:expat))) + (define-public rust-blobby-0.3 (package (name "rust-blobby") @@ -7385,8 +8473,7 @@ storage.") "1xicpf3s2mi5xqnx8ps5mdych4ib5nh2nfsbrsg8ar8bjk1girbg")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-byteorder" ,rust-byteorder-1)) #:cargo-development-inputs (("rust-byteorder" ,rust-byteorder-1) @@ -7395,25 +8482,20 @@ storage.") (define-public rust-block-buffer-0.10 (package (name "rust-block-buffer") - (version "0.10.0") + (version "0.10.4") (source - (origin - (method url-fetch) - (uri (crate-uri "block-buffer" version)) - (file-name - (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "15cbh9jbcfcbbi863dlmamjka2f8l55ld915vr0b0xlf0l16mlzi")))) + (origin + (method url-fetch) + (uri (crate-uri "block-buffer" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0w9sa2ypmrsqqvc20nhwr75wbb5cjr4kkyhpjm1z1lv2kdicfy1h")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-generic-array" ,rust-generic-array-0.14)))) + `(#:cargo-inputs (("rust-generic-array" ,rust-generic-array-0.14)))) (home-page "https://github.com/RustCrypto/utils") (synopsis "Fixed size buffer for block processing of data") - (description - "Fixed size buffer for block processing of data.") + (description "Fixed size buffer for block processing of data.") (license (list license:expat license:asl2.0)))) (define-public rust-block-buffer-0.9 @@ -7740,7 +8822,6 @@ comes with a strict specification.") (sha256 (base32 "09ilf4zyx92hyhkxlsxksfyprzr9iwq5gqqb22aaqr32c8fwp22r")))) (build-system cargo-build-system) - (arguments `(#:skip-build? #t)) (home-page "https://github.com/stbuehler/rust-boxfnonce") (synopsis "Safe FnOnce boxing for Rust") (description "This package provides a safe FnOnce boxing for Rust.") @@ -7836,6 +8917,46 @@ program to verify sandboxing measures are adequate.") ("rust-rustls" ,rust-rustls-0.16) ("rust-sha2" ,rust-sha2-0.9)))))) +(define-public rust-bracoxide-0.1 + (package + (name "rust-bracoxide") + (version "0.1.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "bracoxide" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1j71fs71ss70rj7n4na8hg63w93czhrjdgi7di6nma12lrfg79xd")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.5)))) + (home-page "https://github.com/atahabaki/bracoxide") + (synopsis "Library for brace pattern combination, etc.") + (description "This package provides a feature-rich library for brace pattern +combination, permutation generation, and error handling.") + (license license:expat))) + +(define-public rust-branches-0.1 + (package + (name "rust-branches") + (version "0.1.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "branches" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0alxmzmms4s8vv1v94y2kdq49a4p7728fgkpxx36z2m092bznn3r")))) + (build-system cargo-build-system) + (home-page "https://github.com/fereidani/branches") + (synopsis "Branch hinting prediction and control functions") + (description + "This package provides branch hinting prediction and control functions for +stable Rust including likely, unlikely, assume and abort to help algorithm +optimization.") + (license license:expat))) + (define-public rust-bresenham-0.1 (package (name "rust-bresenham") @@ -8029,69 +9150,132 @@ decompression and compression to Rust.") (description "Rust-ported Browserslist.") (license license:expat))) +(define-public rust-bs58-0.5 + (package + (name "rust-bs58") + (version "0.5.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "bs58" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1x3v51n5n2s3l0rgrsn142akdf331n2qsa75pscw71fi848vm25z")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-sha2" ,rust-sha2-0.10) + ("rust-smallvec" ,rust-smallvec-1) + ("rust-tinyvec" ,rust-tinyvec-1)) + #:cargo-development-inputs + (("rust-assert-matches" ,rust-assert-matches-1) + ("rust-base58" ,rust-base58-0.1) + ("rust-criterion" ,rust-criterion-0.5) + ("rust-rust-base58" ,rust-rust-base58-0.0) + ("rust-tinyvec" ,rust-tinyvec-1)))) + (home-page "https://github.com/Nullus157/bs58-rs") + (synopsis "Another Base58 codec implementation") + (description + "Another Base58 codec implementation. Compared to the base58 crate this +is significantly faster at decoding: about 2.4x as fast when decoding 32 bytes, +almost the same speed for encoding: about 3% slower when encoding 32 bytes. +@code{rust-bs58} is not limited to 128 bytes and supports a configurable alphabet.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-bs58-0.2 (package + (inherit rust-bs58-0.5) (name "rust-bs58") (version "0.2.5") (source (origin (method url-fetch) (uri (crate-uri "bs58" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "125i962x0m0ggdif6ds51wfif2lypiicy469dj5j2l6rm6xycpn9")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-sha2" ,rust-sha2-0.8)) #:cargo-development-inputs (("rust-assert-matches" ,rust-assert-matches-1) ("rust-base58" ,rust-base58-0.1) - ("rust-rust-base58" ,rust-rust-base58-0.0)))) - (home-page "https://github.com/mycorrhiza/bs58-rs") - (synopsis "Another Base58 codec implementation") - (description - "Another Base58 codec implementation. Compared to the base58 crate this -is significantly faster at decoding (about 2.4x as fast when decoding 32 -bytes), almost the same speed for encoding (about 3% slower when encoding 32 -bytes), doesn't have the 128 byte limitation and supports a configurable -alphabet.") - (license (list license:asl2.0 license:expat)))) + ("rust-rust-base58" ,rust-rust-base58-0.0)))))) (define-public rust-bson-2 (package (name "rust-bson") - (version "2.0.1") + (version "2.9.0") (source - (origin - (method url-fetch) - (uri (crate-uri "bson" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 "0ff1xj1vgh2l6sl5gqhkgsfkbhh11jkwd5wf3h0f0mrbg1kd8n7z")))) + (origin + (method url-fetch) + (uri (crate-uri "bson" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "08h2v3yqydx1df27zmkavf746495b0h5rckbd62ll5cw3j64c8ff")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-ahash" ,rust-ahash-0.7) - ("rust-base64" ,rust-base64-0.13) - ("rust-chrono" ,rust-chrono-0.4) - ("rust-hex" ,rust-hex-0.4) - ("rust-indexmap" ,rust-indexmap-1) - ("rust-lazy-static" ,rust-lazy-static-1) - ("rust-rand" ,rust-rand-0.8) - ("rust-serde" ,rust-serde-1) - ("rust-serde-bytes" ,rust-serde-bytes-0.11) - ("rust-serde-json" ,rust-serde-json-1) - ("rust-uuid" ,rust-uuid-0.8)))) + `(#:tests? #f ; file not found for module `tests` + #:cargo-inputs (("rust-ahash" ,rust-ahash-0.8) + ("rust-base64" ,rust-base64-0.13) + ("rust-bitvec" ,rust-bitvec-1) + ("rust-chrono" ,rust-chrono-0.4) + ("rust-hex" ,rust-hex-0.4) + ("rust-indexmap" ,rust-indexmap-2) + ("rust-js-sys" ,rust-js-sys-0.3) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-rand" ,rust-rand-0.8) + ("rust-serde" ,rust-serde-1) + ("rust-serde-bytes" ,rust-serde-bytes-0.11) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-serde-with" ,rust-serde-with-1) + ("rust-serde-with" ,rust-serde-with-3) + ("rust-time" ,rust-time-0.3) + ("rust-uuid" ,rust-uuid-1) + ("rust-uuid" ,rust-uuid-0.8)) + #:cargo-development-inputs + (("rust-assert-matches" ,rust-assert-matches-1) + ("rust-chrono" ,rust-chrono-0.4) + ("rust-criterion" ,rust-criterion-0.3) + ("rust-getrandom" ,rust-getrandom-0.2) + ("rust-pretty-assertions" ,rust-pretty-assertions-0.6) + ("rust-proptest" ,rust-proptest-1) + ("rust-serde-bytes" ,rust-serde-bytes-0.11)))) (home-page "https://github.com/mongodb/bson-rust") (synopsis "Encoding and decoding support for BSON in Rust") - (description - "This crate provides encoding and decoding support for BSON.") + (description "This crate provides encoding and decoding support for BSON.") (license license:expat))) +(define-public rust-bson-1 + (package + (inherit rust-bson-2) + (name "rust-bson") + (version "1.2.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "bson" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1cbc9mbjm4imzcv95y8r6rgl6kgv7ka5ifhhlxaqi4sv0dwaa2ny")))) + (arguments + `(#:tests? #f ; file not found for module `tests` + #:cargo-inputs + (("rust-base64" ,rust-base64-0.13) + ("rust-chrono" ,rust-chrono-0.4) + ("rust-decimal" ,rust-decimal-2) + ("rust-hex" ,rust-hex-0.4) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-linked-hash-map" ,rust-linked-hash-map-0.5) + ("rust-rand" ,rust-rand-0.7) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-uuid" ,rust-uuid-0.8)) + #:cargo-development-inputs + (("rust-assert-matches" ,rust-assert-matches-1) + ("rust-pretty-assertions" ,rust-pretty-assertions-0.6) + ("rust-serde-bytes" ,rust-serde-bytes-0.11)))))) + (define-public rust-bstr-1 (package (name "rust-bstr") @@ -8201,8 +9385,7 @@ UTF-8.") (base32 "0zy0p4vd2kjk7z5m4m8kdwhs5cmx1z02n7v36njhgfs8fs4aclxr")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-memchr" ,rust-memchr-2) ("rust-safemem" ,rust-safemem-0.3) ("rust-slice-deque" ,rust-slice-deque-0.2)))) @@ -8216,20 +9399,20 @@ UTF-8.") (define-public rust-buffered-reader-1 (package (name "rust-buffered-reader") - (version "1.1.2") + (version "1.3.0") (source (origin (method url-fetch) (uri (crate-uri "buffered-reader" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1jf6iqxm3yllm9h3q5f90yj8y9qzr5h0a7aiw38cgk4hagh2s8d4")))) + (base32 "1m4hh3kv5lk4hx9lh6rh05r7m59v3rp86pcqpiwkbs06xcjhm6rb")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-bzip2" ,rust-bzip2-0.4) ("rust-flate2" ,rust-flate2-1) + ("rust-lazy-static" ,rust-lazy-static-1) ("rust-libc" ,rust-libc-0.2)))) (home-page "https://sequoia-pgp.org/") (synopsis "Super-powered Reader") @@ -8472,6 +9655,31 @@ constants from build.rs or a script.") libraries and binaries.") (license (list license:asl2.0 license:expat)))) +(define-public rust-build-fs-tree-0.6 + (package + (name "rust-build-fs-tree") + (version "0.6.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "build-fs-tree" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "11j2gv00zz4hpcsrnw519svchn7fml1m4hndfm2qc30xvnd36s2c")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-clap" ,rust-clap-4) + ("rust-clap-utilities" ,rust-clap-utilities-0.2) + ("rust-derive-more" ,rust-derive-more-0.99) + ("rust-pipe-trait" ,rust-pipe-trait-0.4) + ("rust-serde" ,rust-serde-1) + ("rust-serde-yaml" ,rust-serde-yaml-0.9) + ("rust-text-block-macros" ,rust-text-block-macros-0.1)))) + (home-page "https://github.com/KSXGitHub/build-fs-tree.git") + (synopsis "Generate a filesystem tree from a macro or a YAML tree") + (description "Generate a filesystem tree from a macro or a YAML tree.") + (license license:expat))) + (define-public rust-built-0.7 (package (name "rust-built") @@ -8502,18 +9710,18 @@ libraries and binaries.") (package (inherit rust-built-0.7) (name "rust-built") - (version "0.5.3") + (version "0.5.2") (source (origin (method url-fetch) (uri (crate-uri "built" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0fwpyasbp4pb6ff070xn17w1kwhvzgcx83l15gh8kff6y9m92mff")))) + (base32 "1gig8y8786wkmvimjxgcmk31jgkqxjhkls2b0rgfwfnlkrmhb72v")))) (arguments `(#:cargo-inputs (("rust-cargo-lock" ,rust-cargo-lock-8) ("rust-chrono" ,rust-chrono-0.4) - ("rust-git2" ,rust-git2-0.16) + ("rust-git2" ,rust-git2-0.15) ("rust-semver" ,rust-semver-1)) #:cargo-development-inputs (("rust-tempfile" ,rust-tempfile-3)))) (native-inputs (list pkg-config)) @@ -8572,6 +9780,27 @@ packed, growable bit-vector. Its API mirrors that of @code{Vec} where reasonable.") (license (list license:expat license:asl2.0)))) +(define-public rust-bwrap-1 + (package + (name "rust-bwrap") + (version "1.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "bwrap" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "15dv9mawgmwgpj88k832qjdi94w70advg9zv28bpgig5k8qs6gfi")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-unicode-width" ,rust-unicode-width-0.1)))) + (home-page "https://github.com/micl2e2/bwrap") + (synopsis "Embedded systems-friendly library for wrapping text") + (description + "This package provides a fast, lightweight, embedded systems-friendly +library for wrapping text.") + (license (list license:expat license:gpl3+)))) + (define-public rust-byte-pool-0.2 (package (name "rust-byte-pool") @@ -8598,18 +9827,23 @@ memory usage.") (define-public rust-byte-slice-cast-1 (package (name "rust-byte-slice-cast") - (version "1.2.0") + (version "1.2.2") (source (origin (method url-fetch) (uri (crate-uri "byte-slice-cast" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "162618ai9pnsim49lkjpq2yi2b3wssclvqxwwycw8xrbb58wfc0x")))) + (base32 "033vv1qddzsj9yfsam4abj55rp60digngcr9a8wgv9pccf5rzb63")))) (build-system cargo-build-system) - (home-page "https://github.com/sdroege/bytes-num-slice-cast") + (arguments + `(#:cargo-test-flags + (list "--release" "--" + ;; Some of the tests fail. + "--skip=tests::u16_array"))) + (home-page "https://github.com/sdroege/byte-slice-cast") (synopsis - "Safely cast bytes slices from/to slices of built-in fundamental numeric types") + "Safely cast bytes slices from/to slices of built-in fundamental numeric types") (description "This Rust library enables safely cast bytes slices from/to slices of built-in fundamental numeric types.") (license license:expat))) @@ -8628,34 +9862,51 @@ of built-in fundamental numeric types.") (base32 "1mqi29wsm8njpl51pfwr31wmpzs5ahlcb40wsjyd92l90ixcmdg3")))) (build-system cargo-build-system) - (arguments `(#:skip-build? #t)) (home-page "https://github.com/RustCrypto/utils") (synopsis "Bytes related utility functions") (description "Bytes related utility functions.") (license (list license:asl2.0 license:expat)))) -(define-public rust-byte-unit-4 +(define-public rust-byte-unit-5 (package (name "rust-byte-unit") - (version "4.0.9") + (version "5.1.4") (source (origin (method url-fetch) (uri (crate-uri "byte-unit" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0lxi11qf6h1rqr0yhsh7i6755l325qrkv9r4bgismyik531mi1qw")))) + (base32 "0gnnl92szl7d6bxz028n03ifflg96z4xp0lxqc3m8rmjy2yikb1k")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs - (("rust-serde" ,rust-serde-1) - ("rust-utf8-width" ,rust-utf8-width-0.1)))) + `(#:cargo-inputs (("rust-rocket" ,rust-rocket-0.5) + ("rust-rust-decimal" ,rust-rust-decimal-1) + ("rust-serde" ,rust-serde-1) + ("rust-utf8-width" ,rust-utf8-width-0.1)) + #:cargo-development-inputs (("rust-serde-json" ,rust-serde-json-1)))) (home-page "https://magiclen.org/byte-unit") (synopsis "Library for interaction with units of bytes") (description "This package provides a library for interaction with units of bytes.") (license license:expat))) +(define-public rust-byte-unit-4 + (package + (inherit rust-byte-unit-5) + (name "rust-byte-unit") + (version "4.0.9") + (source + (origin + (method url-fetch) + (uri (crate-uri "byte-unit" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0lxi11qf6h1rqr0yhsh7i6755l325qrkv9r4bgismyik531mi1qw")))) + (arguments + `(#:cargo-inputs (("rust-serde" ,rust-serde-1) + ("rust-utf8-width" ,rust-utf8-width-0.1)))))) + (define-public rust-bytecheck-0.6 (package (name "rust-bytecheck") @@ -8986,8 +10237,31 @@ little-endian.") #:cargo-development-inputs (("rust-rand" ,rust-rand-0.3)))))) +(define-public rust-bytestring-1 + (package + (name "rust-bytestring") + (version "1.3.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "bytestring" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0wpf0c5c72x3ycdb85vznkmcy8fy6ckzd512064dyabbx81h5n3l")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; unresolved import `ahash` + #:cargo-inputs (("rust-bytes" ,rust-bytes-1) + ("rust-serde" ,rust-serde-1)))) + (home-page "https://actix.rs") + (synopsis "UTF-8 encoded string with Bytes as a storage") + (description "This package provides a UTF-8 encoded read-only string using +`Bytes` as storage.") + (license (list license:expat license:asl2.0)))) + (define-public rust-bytestring-0.1 (package + (inherit rust-bytestring-1) (name "rust-bytestring") (version "0.1.5") (source @@ -8997,18 +10271,12 @@ little-endian.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "0qzkncgky5p5vsdb9msmfg6d92dcs9idcjcr5nk7inkja7x0az7w")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-bytes" ,rust-bytes-0.5) ("rust-serde" ,rust-serde-1)) #:cargo-development-inputs - (("rust-serde-json" ,rust-serde-json-1)))) - (home-page "https://actix.rs") - (synopsis "UTF-8 encoded string with Bytes as a storage") - (description - "This package provides a UTF-8 encoded string with Bytes as a storage.") - (license (list license:expat license:asl2.0)))) + (("rust-serde-json" ,rust-serde-json-1)))))) (define-public rust-byteyarn-0.2 (package @@ -9245,32 +10513,33 @@ Tagging Specification. This library comes with functionality to, among others, add a tag, ensure/check a tag exists and get the state of a tag.") (license license:expat))) -(define-public rust-calamine-0.18 +(define-public rust-calamine-0.24 (package (name "rust-calamine") - (version "0.18.0") + (version "0.24.0") (source (origin (method url-fetch) (uri (crate-uri "calamine" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1fssrwkwar1z4d2f0xl3cqg2y8qlmlc05g5xy305mkmxlj6sfv5q")))) + (base32 "1nilccwz0vqzzxjxcr06pi25k80j2wz0f89mwg1v3igx4r932fla")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-byteorder" ,rust-byteorder-1) - ("rust-chrono" ,rust-chrono-0.4) - ("rust-codepage" ,rust-codepage-0.1) - ("rust-encoding-rs" ,rust-encoding-rs-0.8) - ("rust-log" ,rust-log-0.4) - ("rust-quick-xml" ,rust-quick-xml-0.19) - ("rust-serde" ,rust-serde-1) - ("rust-zip" ,rust-zip-0.5)) - #:cargo-development-inputs - (("rust-env-logger" ,rust-env-logger-0.7) - ("rust-glob" ,rust-glob-0.3)))) + `(#:tests? #f ; Doc tests segfault. + #:cargo-inputs (("rust-byteorder" ,rust-byteorder-1) + ("rust-chrono" ,rust-chrono-0.4) + ("rust-codepage" ,rust-codepage-0.1) + ("rust-encoding-rs" ,rust-encoding-rs-0.8) + ("rust-log" ,rust-log-0.4) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-quick-xml" ,rust-quick-xml-0.31) + ("rust-serde" ,rust-serde-1) + ("rust-zip" ,rust-zip-0.6)) + #:cargo-development-inputs (("rust-env-logger" ,rust-env-logger-0.10) + ("rust-glob" ,rust-glob-0.3) + ("rust-serde-derive" ,rust-serde-derive-1) + ("rust-sha256" ,rust-sha256-1)))) (home-page "https://github.com/tafia/calamine") (synopsis "Reader and deserializer for spreadsheet files") (description @@ -9278,6 +10547,31 @@ others, add a tag, ensure/check a tag exists and get the state of a tag.") spreadsheet file.") (license license:expat))) +(define-public rust-calamine-0.18 + (package + (inherit rust-calamine-0.24) + (name "rust-calamine") + (version "0.18.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "calamine" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1fssrwkwar1z4d2f0xl3cqg2y8qlmlc05g5xy305mkmxlj6sfv5q")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs (("rust-byteorder" ,rust-byteorder-1) + ("rust-chrono" ,rust-chrono-0.4) + ("rust-codepage" ,rust-codepage-0.1) + ("rust-encoding-rs" ,rust-encoding-rs-0.8) + ("rust-log" ,rust-log-0.4) + ("rust-quick-xml" ,rust-quick-xml-0.19) + ("rust-serde" ,rust-serde-1) + ("rust-zip" ,rust-zip-0.5)) + #:cargo-development-inputs (("rust-env-logger" ,rust-env-logger-0.7) + ("rust-glob" ,rust-glob-0.3)))))) + (define-public rust-calibright-0.1 (package (name "rust-calibright") @@ -9402,8 +10696,7 @@ brightness between monitors.") (base32 "0z3jlsv3g28097dhsmi2l8nzkd3p937jhb4pg52njhb0wxkn20qb")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-log" ,rust-log-0.4) ("rust-nix" ,rust-nix-0.18)))))) @@ -9505,8 +10798,31 @@ brightness between monitors.") tracking memory usage and enabling limits to be set.") (license (list license:expat license:asl2.0)))) +(define-public rust-capnp-0.19 + (package + (name "rust-capnp") + (version "0.19.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "capnp" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1v90fxhhwgcszxday345rmjp3nicpnbvshnccd55qsbszgk3465i")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-embedded-io" ,rust-embedded-io-0.6) + ("rust-quickcheck" ,rust-quickcheck-1)) + #:cargo-development-inputs (("rust-quickcheck" ,rust-quickcheck-1)))) + (home-page "https://github.com/capnproto/capnproto-rust") + (synopsis "Runtime library for Cap'n Proto data encoding") + (description "This package provides a runtime library for Cap'n Proto data +encoding.") + (license license:expat))) + (define-public rust-capnp-0.14 (package + (inherit rust-capnp-0.19) (name "rust-capnp") (version "0.14.11") (source (origin @@ -9516,17 +10832,11 @@ tracking memory usage and enabling limits to be set.") (sha256 (base32 "1wwp619sib07raykk93n6j7amvsinlchnicxfjnnb7bx5if0ijid")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-quickcheck" ,rust-quickcheck-0.9)) #:cargo-development-inputs - (("rust-quickcheck" ,rust-quickcheck-0.9)))) - (home-page "https://github.com/capnproto/capnproto-rust") - (synopsis "Runtime library for Cap'n Proto data encoding") - (description "This package provides a runtime library for Cap'n Proto data -encoding.") - (license license:expat))) + (("rust-quickcheck" ,rust-quickcheck-0.9)))))) (define-public rust-capnp-0.13 (package @@ -9546,8 +10856,33 @@ encoding.") #:cargo-development-inputs (("rust-quickcheck" ,rust-quickcheck-0.9)))))) +(define-public rust-capnp-futures-0.19 + (package + (name "rust-capnp-futures") + (version "0.19.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "capnp-futures" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "06zvxipmy0xdsxxqr54gs4yi8rgl33iprfhx4nzc0fsfncy4ib2z")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-capnp" ,rust-capnp-0.19) + ("rust-futures" ,rust-futures-0.3)) + #:cargo-development-inputs (("rust-capnp" ,rust-capnp-0.19) + ("rust-futures" ,rust-futures-0.3) + ("rust-quickcheck" ,rust-quickcheck-1)))) + (home-page "https://github.com/dwrensha/capnproto-rust") + (synopsis "Async serialization for Cap'n Proto messages") + (description "This package provides async serialization for Cap'n Proto +messages.") + (license license:expat))) + (define-public rust-capnp-futures-0.14 (package + (inherit rust-capnp-futures-0.19) (name "rust-capnp-futures") (version "0.14.2") (source (origin @@ -9557,7 +10892,6 @@ encoding.") (sha256 (base32 "0fp6lr04w50mzfpxvvrbdm9pny8ch17514y7qgcsk6giqqf808cq")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-capnp" ,rust-capnp-0.14) @@ -9565,12 +10899,7 @@ encoding.") #:cargo-development-inputs (("rust-capnp" ,rust-capnp-0.14) ("rust-futures" ,rust-futures-0.3) - ("rust-quickcheck" ,rust-quickcheck-0.9)))) - (home-page "https://github.com/dwrensha/capnproto-rust") - (synopsis "Async serialization for Cap'n Proto messages") - (description "This package provides async serialization for Cap'n Proto -messages.") - (license license:expat))) + ("rust-quickcheck" ,rust-quickcheck-0.9)))))) (define-public rust-capnp-futures-0.13 (package @@ -9592,8 +10921,32 @@ messages.") (("rust-capnp" ,rust-capnp-0.13) ("rust-quickcheck" ,rust-quickcheck-0.9)))))) +(define-public rust-capnp-rpc-0.19 + (package + (name "rust-capnp-rpc") + (version "0.19.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "capnp-rpc" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "05hahpmfjnn49mzv4b2zp4y6si9g6yvjy6kgm2ia9apndjcbl78p")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-capnp" ,rust-capnp-0.19) + ("rust-capnp-futures" ,rust-capnp-futures-0.19) + ("rust-futures" ,rust-futures-0.3)))) + (native-inputs (list capnproto)) + (home-page "https://github.com/capnproto/capnproto-rust") + (synopsis "Cap'n Proto remote procedure call protocol implementation") + (description "This package provides an implementation of the Cap'n Proto +remote procedure call protocol") + (license license:expat))) + (define-public rust-capnp-rpc-0.14 (package + (inherit rust-capnp-rpc-0.19) (name "rust-capnp-rpc") (version "0.14.1") (source (origin @@ -9603,19 +10956,11 @@ messages.") (sha256 (base32 "0pm9bjw481lw1zp8lmzkpsjrb85lbjg5s46piqbc3wk8dzwifksc")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-capnp" ,rust-capnp-0.14) ("rust-capnp-futures" ,rust-capnp-futures-0.14) - ("rust-futures" ,rust-futures-0.3)))) - (native-inputs - (list capnproto)) - (home-page "https://github.com/capnproto/capnproto-rust") - (synopsis "Cap'n Proto remote procedure call protocol implementation") - (description "This package provides an implementation of the Cap'n Proto -remote procedure call protocol") - (license license:expat))) + ("rust-futures" ,rust-futures-0.3)))))) (define-public rust-capnp-rpc-0.13 (package @@ -9637,26 +10982,43 @@ remote procedure call protocol") #:cargo-development-inputs (("rust-capnpc" ,rust-capnpc-0.13)))))) -(define-public rust-capnpc-0.13 +(define-public rust-capnpc-0.19 (package (name "rust-capnpc") - (version "0.13.1") + (version "0.19.0") (source (origin (method url-fetch) (uri (crate-uri "capnpc" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1hbm5xqpam3f0ha5ds39wjmpqpzdalpbrls9wlp7m3slh3p5r1c1")))) + (base32 "1v49w7zsv4bkdn88dfmi2hk5dzv5pgs0qwgkq99jsn081w7a6ny7")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs (("rust-capnp" ,rust-capnp-0.13)))) + `(#:cargo-test-flags '("--release" "--" + "--skip=compiler_command_new_no_out_dir") + #:cargo-inputs (("rust-capnp" ,rust-capnp-0.19)))) (home-page "https://github.com/capnproto/capnproto-rust") (synopsis "Cap'n Proto code generation") - (description "Cap'n Proto code generation") + (description "Cap'n Proto code generation.") (license license:expat))) +(define-public rust-capnpc-0.13 + (package + (inherit rust-capnpc-0.19) + (name "rust-capnpc") + (version "0.13.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "capnpc" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1hbm5xqpam3f0ha5ds39wjmpqpzdalpbrls9wlp7m3slh3p5r1c1")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs (("rust-capnp" ,rust-capnp-0.13)))))) + (define-public rust-caps-0.5 (package (name "rust-caps") @@ -9725,104 +11087,6 @@ capabilities.") (description "This package provides spec generation for clap-rs/clap.") (license license:expat))) -;; TODO: Remove this package in favor of rust-cargo in rust-apps.scm. -(define-public rust-cargo-0.76 - (package - (name "rust-cargo") - (version "0.76.0") - (source - (origin - (method url-fetch) - (uri (crate-uri "cargo" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 "14yjyvj9bl6mlzx6bbi3igflgdrx1hil9ifnf1dl9xnm4mb2gjw6")))) - (build-system cargo-build-system) - (arguments - `(#:tests? #f ; unresolved import `cargo_test_support` - #:cargo-inputs - (("rust-anstream" ,rust-anstream-0.6) - ("rust-anstyle" ,rust-anstyle-1) - ("rust-anyhow" ,rust-anyhow-1) - ("rust-base64" ,rust-base64-0.21) - ("rust-bytesize" ,rust-bytesize-1) - ("rust-cargo-credential" ,rust-cargo-credential-0.4) - ("rust-cargo-credential-libsecret" ,rust-cargo-credential-libsecret-0.4) - ("rust-cargo-credential-macos-keychain" ,rust-cargo-credential-macos-keychain-0.4) - ("rust-cargo-credential-wincred" ,rust-cargo-credential-wincred-0.4) - ("rust-cargo-platform" ,rust-cargo-platform-0.1) - ("rust-cargo-util" ,rust-cargo-util-0.2) - ("rust-clap" ,rust-clap-4) - ("rust-color-print" ,rust-color-print-0.3) - ("rust-crates-io" ,rust-crates-io-0.39) - ("rust-curl" ,rust-curl-0.4) - ("rust-curl-sys" ,rust-curl-sys-0.4) - ("rust-filetime" ,rust-filetime-0.2) - ("rust-flate2" ,rust-flate2-1) - ("rust-flate2" ,rust-flate2-1) - ("rust-git2" ,rust-git2-0.18) - ("rust-git2-curl" ,rust-git2-curl-0.19) - ("rust-gix" ,rust-gix-0.55) - ("rust-gix-features" ,rust-gix-features-0.35) - ("rust-glob" ,rust-glob-0.3) - ("rust-hex" ,rust-hex-0.4) - ("rust-hmac" ,rust-hmac-0.12) - ("rust-home" ,rust-home-0.5) - ("rust-http-auth" ,rust-http-auth-0.1) - ("rust-humantime" ,rust-humantime-2) - ("rust-ignore" ,rust-ignore-0.4) - ("rust-im-rc" ,rust-im-rc-15) - ("rust-indexmap" ,rust-indexmap-2) - ("rust-itertools" ,rust-itertools-0.11) - ("rust-jobserver" ,rust-jobserver-0.1) - ("rust-lazycell" ,rust-lazycell-1) - ("rust-libc" ,rust-libc-0.2) - ("rust-libgit2-sys" ,rust-libgit2-sys-0.16) - ("rust-memchr" ,rust-memchr-2) - ("rust-opener" ,rust-opener-0.6) - ("rust-openssl" ,rust-openssl-0.10) - ("rust-os-info" ,rust-os-info-3) - ("rust-pasetors" ,rust-pasetors-0.6) - ("rust-pathdiff" ,rust-pathdiff-0.2) - ("rust-pulldown-cmark" ,rust-pulldown-cmark-0.9) - ("rust-rand" ,rust-rand-0.8) - ("rust-rustfix" ,rust-rustfix-0.6) - ("rust-semver" ,rust-semver-1) - ("rust-serde" ,rust-serde-1) - ("rust-serde-untagged" ,rust-serde-untagged-0.1) - ("rust-serde-value" ,rust-serde-value-0.7) - ("rust-serde-ignored" ,rust-serde-ignored-0.1) - ("rust-serde-json" ,rust-serde-json-1) - ("rust-sha1" ,rust-sha1-0.10) - ("rust-shell-escape" ,rust-shell-escape-0.1) - ("rust-supports-hyperlinks" ,rust-supports-hyperlinks-2) - ("rust-syn" ,rust-syn-2) - ("rust-tar" ,rust-tar-0.4) - ("rust-tar" ,rust-tar-0.4) - ("rust-tempfile" ,rust-tempfile-3) - ("rust-time" ,rust-time-0.3) - ("rust-toml" ,rust-toml-0.8) - ("rust-toml-edit" ,rust-toml-edit-0.20) - ("rust-tracing" ,rust-tracing-0.1) - ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3) - ("rust-unicase" ,rust-unicase-2) - ("rust-unicode-width" ,rust-unicode-width-0.1) - ("rust-unicode-xid" ,rust-unicode-xid-0.2) - ("rust-url" ,rust-url-2) - ("rust-walkdir" ,rust-walkdir-2) - ("rust-windows-sys" ,rust-windows-sys-0.48)) - #:cargo-development-inputs (("rust-same-file" ,rust-same-file-1) - ("rust-snapbox" ,rust-snapbox-0.4)))) - (native-inputs - (list pkg-config)) - (inputs - (list curl libssh2 libgit2-1.7 openssl zlib)) - (home-page "https://crates.io") - (synopsis "Package manager for Rust") - (description "Cargo, a package manager for Rust. This package provides -the library crate of Cargo.") - (license (list license:expat license:asl2.0)))) - (define-public rust-cargo-config2-0.1 (package (name "rust-cargo-config2") @@ -9864,14 +11128,14 @@ the library crate of Cargo.") (define-public rust-cargo-credential-0.4 (package (name "rust-cargo-credential") - (version "0.4.1") + (version "0.4.4") (source (origin (method url-fetch) (uri (crate-uri "cargo-credential" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0myp2fic79yaclb5lik9rv4kg12sly1k0zba4gbx2wljyqmkxdhy")))) + (base32 "1qvmiy683s4hq3fk9gz7bvshngjc2p1mn5arkw5fc5c7ygd04p2f")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-anyhow" ,rust-anyhow-1) @@ -9880,7 +11144,7 @@ the library crate of Cargo.") ("rust-serde-json" ,rust-serde-json-1) ("rust-thiserror" ,rust-thiserror-1) ("rust-time" ,rust-time-0.3) - ("rust-windows-sys" ,rust-windows-sys-0.48)) + ("rust-windows-sys" ,rust-windows-sys-0.52)) #:cargo-development-inputs (("rust-snapbox" ,rust-snapbox-0.4)))) (home-page "https://github.com/rust-lang/cargo") (synopsis "Library to assist writing Cargo credential helpers") @@ -9915,14 +11179,14 @@ the library crate of Cargo.") (define-public rust-cargo-credential-libsecret-0.4 (package (name "rust-cargo-credential-libsecret") - (version "0.4.1") + (version "0.4.3") (source (origin (method url-fetch) (uri (crate-uri "cargo-credential-libsecret" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "02dwjklxslbyp7y0kw4la05wn39l2pyim4vkqxid5kjzhlkzarhy")))) + (base32 "1mbqys6gv4my81zwxcf12mj5xkpvykd4254hfns1npzqwnmy3lv2")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-anyhow" ,rust-anyhow-1) @@ -9953,6 +11217,52 @@ GNOME libsecret.") ("rust-cargo-credential" ,rust-cargo-credential-0.3) ("rust-libloading" ,rust-libloading-0.8)))))) +(define-public rust-cargo-husky-1 + (package + (name "rust-cargo-husky") + (version "1.5.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "cargo-husky" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1b9jx720dzw9s7rl82bywz4d089c9rb0j526c1jfzs1g4llvc0kv")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; Not all files included. + #:cargo-development-inputs (("rust-lazy-static" ,rust-lazy-static-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-semver" ,rust-semver-0.9)))) + (home-page "https://github.com/rhysd/cargo-husky#readme") + (synopsis "Autotest support with git hooks") + (description "Cargo-husky is a development tool to set Git hooks +automatically on cargo test.") + (license license:expat))) + +(define-public rust-cargo-manifest-0.13 + (package + (name "rust-cargo-manifest") + (version "0.13.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "cargo-manifest" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "13a0dgqchxjmhr4idswpri2l3lwv7fxga69yj5hvylla0adg8vxz")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-serde" ,rust-serde-1) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-toml" ,rust-toml-0.8)) + #:cargo-development-inputs (("rust-insta" ,rust-insta-1)))) + (home-page "https://github.com/LukeMathWalker/cargo-manifest") + (synopsis "Parse and manipulate manifests @code{Cargo.toml} files") + (description "This package provides a helper crate to parse and manipulate +manifests in @code{Cargo.toml} files.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-cargo-metadata-0.18 (package (name "rust-cargo-metadata") @@ -10222,17 +11532,17 @@ optional dependency graph analysis.") supported by Cargo.") (license (list license:expat license:asl2.0)))) -(define-public rust-cargo-toml-0.16 +(define-public rust-cargo-toml-0.19 (package (name "rust-cargo-toml") - (version "0.16.3") + (version "0.19.2") (source (origin (method url-fetch) (uri (crate-uri "cargo_toml" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1lxgiwha2kqbk60iq5cvczbnd5xrqa4cj7bqk6k8wf64qsdn5yg3")))) + (base32 "1gljfkdjx07fisn5xkklv56ki3p49ppf8fkry7c1psx28bgmd0x9")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-serde" ,rust-serde-1) @@ -10243,17 +11553,33 @@ supported by Cargo.") parsing with Serde.") (license (list license:asl2.0 license:expat)))) +(define-public rust-cargo-toml-0.16 + (package + (inherit rust-cargo-toml-0.19) + (name "rust-cargo-toml") + (version "0.16.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "cargo_toml" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1lxgiwha2kqbk60iq5cvczbnd5xrqa4cj7bqk6k8wf64qsdn5yg3")))) + (arguments + `(#:cargo-inputs (("rust-serde" ,rust-serde-1) + ("rust-toml" ,rust-toml-0.8)))))) + (define-public rust-cargo-util-0.2 (package (name "rust-cargo-util") - (version "0.2.8") + (version "0.2.9") (source (origin (method url-fetch) (uri (crate-uri "cargo-util" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1yv3s2ycvr7hp5qx5y8gxvgg2lybc2xfm09qfvfksddji8fxsaxv")))) + (base32 "0hp3sj7j9l5k771ayz1srm39gr21mcw9v3qpy3wc38akdqy2r1kl")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -10261,6 +11587,7 @@ parsing with Serde.") ("rust-core-foundation" ,rust-core-foundation-0.9) ("rust-filetime" ,rust-filetime-0.2) ("rust-hex" ,rust-hex-0.4) + ("rust-ignore" ,rust-ignore-0.4) ("rust-jobserver" ,rust-jobserver-0.1) ("rust-libc" ,rust-libc-0.2) ("rust-miow" ,rust-miow-0.6) @@ -10270,7 +11597,7 @@ parsing with Serde.") ("rust-tempfile" ,rust-tempfile-3) ("rust-tracing" ,rust-tracing-0.1) ("rust-walkdir" ,rust-walkdir-2) - ("rust-windows-sys" ,rust-windows-sys-0.48)))) + ("rust-windows-sys" ,rust-windows-sys-0.52)))) (inputs (list openssl)) (native-inputs @@ -10311,6 +11638,51 @@ parsing with Serde.") ("rust-walkdir" ,rust-walkdir-2) ("rust-winapi" ,rust-winapi-0.3)))))) +(define-public rust-cargo-util-schemas-0.2 + (package + (name "rust-cargo-util-schemas") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "cargo-util-schemas" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1jncrbsh5w8pl968a04893mwkaq0cgav19zyy6wpwj4lmj02fgg6")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-semver" ,rust-semver-1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-untagged" ,rust-serde-untagged-0.1) + ("rust-serde-value" ,rust-serde-value-0.7) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-toml" ,rust-toml-0.8) + ("rust-unicode-xid" ,rust-unicode-xid-0.2) + ("rust-url" ,rust-url-2)))) + (home-page "https://github.com/rust-lang/cargo") + (synopsis "Deserialization schemas for Cargo") + (description "This package provides deserialization schemas for Cargo.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-casey-0.4 + (package + (name "rust-casey") + (version "0.4.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "casey" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0sv5ll6aavwcigmr53b22dg16adlz4pa2pb73367sna974k8cib1")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-syn" ,rust-syn-1)))) + (home-page "https://github.com/jordy25519/casey") + (synopsis "Case transforming macros for ident tokens") + (description "Case transforming macros for ident tokens.") + (license license:expat))) + (define-public rust-cassowary-0.3 (package (name "rust-cassowary") @@ -10323,7 +11695,6 @@ parsing with Serde.") (sha256 (base32 "0lvanj0gsk6pc1chqrh4k5k0vi1rfbgzmsk46dwy3nmrqyw711nz")))) (build-system cargo-build-system) - (arguments `(#:skip-build? #t)) (home-page "https://github.com/dylanede/cassowary-rs") (synopsis "Implementation of the Cassowary linear constraint solving algorithm") @@ -10405,6 +11776,20 @@ box''.") types that works on stable Rust.") (license license:expat))) +(define-public rust-castaway-0.1 + (package + (inherit rust-castaway-0.2) + (name "rust-castaway") + (version "0.1.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "castaway" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1xhspwy477qy5yg9c3jp713asxckjpx0vfrmz5l7r5zg7naqysd2")))) + (arguments '()))) + (define-public rust-cblas-sys-0.1 (package (name "rust-cblas-sys") @@ -10529,7 +11914,6 @@ that need to represent UTF-16 data as 8-bit characters.") (sha256 (base32 "17p821nc6jm830vzl2lmwz60g3a30hcm33nk6l257i1rjdqw85px")))) (build-system cargo-build-system) - (arguments `(#:skip-build? #t)) (home-page "https://github.com/katharostech/cfg_aliases") (synopsis "Utility to help you with long winded @code{#[cfg()]} checks") (description @@ -10644,6 +12028,29 @@ chain, the first matching branch is the item that gets emitted.") (("rust-compiler-builtins" ,rust-compiler-builtins-0.1) ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1)))))) +(define-public rust-cfg-vis-0.3 + (package + (name "rust-cfg-vis") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "cfg-vis" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1745qzkxar9yd3wy4gzzsakv1cjcibhgnr3m2p5f43y1byzw78n3")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-proc-macro-crate" ,rust-proc-macro-crate-1) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)))) + (home-page "https://github.com/TOETOE55/cfg-vis") + (synopsis "Macro to support `#[cfg()]` on visibility") + (description + "This package provides a macro to support `#[cfg()]` on visibility.") + (license license:expat))) + (define-public rust-chan-0.1 (package (name "rust-chan") @@ -11109,6 +12516,24 @@ usage.") interoperation between crates in Rust.") (license (list license:expat license:asl2.0 license:zlib)))) +(define-public rust-circular-0.3 + (package + (name "rust-circular") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "circular" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1slb0zd1xj0fjd0ql86zs57l1xbn5ywsyj1d8397bcvc1yg27z5h")))) + (build-system cargo-build-system) + (home-page "https://github.com/sozu-proxy/circular") + (synopsis "stream abstraction for nom") + (description + "This package provides a stream abstraction designed for use with nom.") + (license license:expat))) + (define-public rust-ci-info-0.3 (package (name "rust-ci-info") @@ -11403,18 +12828,18 @@ how to behave across the three main input sources") (define-public rust-clap-derive-4 (package (name "rust-clap-derive") - (version "4.4.7") + (version "4.5.4") (source (origin (method url-fetch) (uri (crate-uri "clap_derive" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0hk4hcxl56qwqsf4hmf7c0gr19r9fbxk0ah2bgkr36pmmaph966g")))) + (base32 "0r2gs2p10pb435w52xzsgz2mmx5qd3qfkmk29y4mbz9ph11k30aj")))) (build-system cargo-build-system) (arguments (list #:cargo-inputs - `(("rust-heck" ,rust-heck-0.4) + `(("rust-heck" ,rust-heck-0.5) ("rust-proc-macro2" ,rust-proc-macro2-1) ("rust-quote" ,rust-quote-1) ("rust-syn" ,rust-syn-2)))) @@ -11447,7 +12872,7 @@ how to behave across the three main input sources") (define-public rust-clap-4 (package (name "rust-clap") - (version "4.4.16") + (version "4.5.4") (source (origin (method url-fetch) @@ -11455,7 +12880,7 @@ how to behave across the three main input sources") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0ialpybl8n8ybfikzy5f07d64pfdajls0s00bf4wgkh4q20liraq")))) + "1828wm9qws5gh2xnimnvmp2vria6d6hsxnqmhnm84dwjcxm0dg4h")))) (build-system cargo-build-system) (arguments (list #:cargo-inputs @@ -11465,9 +12890,9 @@ how to behave across the three main input sources") `(("rust-humantime" ,rust-humantime-2) ("rust-rustversion" ,rust-rustversion-1) ("rust-shlex" ,rust-shlex-1) - ("rust-snapbox" ,rust-snapbox-0.4) + ("rust-snapbox" ,rust-snapbox-0.5) ("rust-trybuild" ,rust-trybuild-1) - ("rust-trycmd" ,rust-trycmd-0.14)))) + ("rust-trycmd" ,rust-trycmd-0.15)))) (home-page "https://clap.rs/") (synopsis "Command Line Argument Parser") (description @@ -11553,14 +12978,14 @@ Command Line Argument Parser.") (define-public rust-clap-builder-4 (package (name "rust-clap-builder") - (version "4.4.16") + (version "4.5.2") (source (origin (method url-fetch) (uri (crate-uri "clap_builder" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1fv06ivpzpkhjm4bvxzg3fl4y61mvlf481zms4pksq1iypbq5jsr")))) + "1d7p4hph4fyhaphkf0v5zv0kq4lz25a9jq2f901yrq3afqp9w4mf")))) (build-system cargo-build-system) (arguments `(#:cargo-test-flags @@ -11572,8 +12997,8 @@ Command Line Argument Parser.") (("rust-anstream" ,rust-anstream-0.6) ("rust-anstyle" ,rust-anstyle-1) ("rust-backtrace" ,rust-backtrace-0.3) - ("rust-clap-lex" ,rust-clap-lex-0.6) - ("rust-strsim" ,rust-strsim-0.10) + ("rust-clap-lex" ,rust-clap-lex-0.7) + ("rust-strsim" ,rust-strsim-0.11) ("rust-terminal-size" ,rust-terminal-size-0.3) ("rust-unicase" ,rust-unicase-2) ("rust-unicode-width" ,rust-unicode-width-0.1)) @@ -11677,17 +13102,17 @@ 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.6 +(define-public rust-clap-lex-0.7 (package (name "rust-clap-lex") - (version "0.6.0") + (version "0.7.0") (source (origin (method url-fetch) (uri (crate-uri "clap_lex" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1l8bragdvim7mva9flvd159dskn2bdkpl0jqrr41wnjfn8pcfbvh")))) + (base32 "1kh1sckgq71kay2rrr149pl9gbsrvyccsq6xm5xpnq0cxnyqzk4q")))) (build-system cargo-build-system) (home-page "https://github.com/clap-rs/clap/tree/master/clap_lex") (synopsis "Command line parser for Clap") @@ -11698,6 +13123,19 @@ stream of tokens.") ;; The user can choose either license. (license (list license:expat license:asl2.0)))) +(define-public rust-clap-lex-0.6 + (package + (inherit rust-clap-lex-0.7) + (name "rust-clap-lex") + (version "0.6.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "clap_lex" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1l8bragdvim7mva9flvd159dskn2bdkpl0jqrr41wnjfn8pcfbvh")))))) + (define-public rust-clap-lex-0.5 (package (inherit rust-clap-lex-0.6) @@ -11786,6 +13224,28 @@ stream of tokens.") (("rust-clap" ,rust-clap-3) ("rust-snapbox" ,rust-snapbox-0.2)))))) +(define-public rust-clap-utilities-0.2 + (package + (name "rust-clap-utilities") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "clap-utilities" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "163p99zc3wp02khfrqvn176c5bbprv03l8jrbrh16lgngs0gzg0m")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-clap" ,rust-clap-4) + ("rust-clap-complete" ,rust-clap-complete-4) + ("rust-pipe-trait" ,rust-pipe-trait-0.4) + ("rust-thiserror" ,rust-thiserror-1)))) + (home-page "https://github.com/KSXGitHub/clap-utilities.git") + (synopsis "Small utilities related to clap") + (description "This package provides small utilities related to clap.") + (license license:expat))) + (define-public rust-clap-verbosity-flag-2 (package (name "rust-clap-verbosity-flag") @@ -11814,32 +13274,48 @@ stream of tokens.") Clap.") (license (list license:expat license:asl2.0)))) -(define-public rust-clearscreen-1 +(define-public rust-clearscreen-2 (package (name "rust-clearscreen") - (version "1.0.4") + (version "2.0.1") (source (origin (method url-fetch) (uri (crate-uri "clearscreen" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "083ycj7qhwlq8azy0rl9lpbr69k87hn622wc8mi96w293rsq1zwy")))) + (base32 "15799yi8azfkn86m1i1kgb7xxk7k321gf8zx5vk08rjq38pz5wvj")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-nix" ,rust-nix-0.20) - ("rust-terminfo" ,rust-terminfo-0.7) - ("rust-thiserror" ,rust-thiserror-1) - ("rust-which" ,rust-which-4) - ("rust-winapi" ,rust-winapi-0.3)))) + `(#:cargo-inputs (("rust-nix" ,rust-nix-0.26) + ("rust-terminfo" ,rust-terminfo-0.8) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-which" ,rust-which-4) + ("rust-winapi" ,rust-winapi-0.3)))) (home-page "https://github.com/watchexec/clearscreen") (synopsis "Cross-platform terminal screen clearing") - (description - "This crate provides cross-platform terminal screen clearing.") + (description "This crate provides cross-platform terminal screen clearing.") (license (list license:asl2.0 license:expat)))) +(define-public rust-clearscreen-1 + (package + (inherit rust-clearscreen-2) + (name "rust-clearscreen") + (version "1.0.11") + (source + (origin + (method url-fetch) + (uri (crate-uri "clearscreen" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "05xk23szs0s2ybf7gvhhaqs0bmj7dv58zivv2059rxh3saysspg5")))) + (arguments + `(#:cargo-inputs (("rust-nix" ,rust-nix-0.24) + ("rust-terminfo" ,rust-terminfo-0.7) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-which" ,rust-which-4) + ("rust-winapi" ,rust-winapi-0.3)))))) + (define-public rust-cli-clipboard-0.4 (package (name "rust-cli-clipboard") @@ -12103,8 +13579,56 @@ CMAKE environmental variable is set.") (license (list license:asl2.0 license:expat)))) +(define-public rust-cobs-0.2 + (package + (name "rust-cobs") + (version "0.2.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "cobs" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "05gd16mws4yd63h8jr3p08in8y8w21rpjp5jb55hzl9bgalh5fk7")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-development-inputs (("rust-quickcheck" ,rust-quickcheck-0.5)))) + (home-page "https://github.com/jamesmunns/cobs.rs") + (synopsis + "Implementation of the Consistent Overhead Byte Stuffing (COBS) algorithm") + (description + "This is an implementation of the @acronym{Consistent Overhead Byte +Stuffing, COBS} algorithm. COBS is an algorithm for transforming a message into +an encoding where a specific value (the \"sentinel\" value) is not used. This +value can then be used to mark frame boundaries in a serial communication channel.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-codegenrs-3 + (package + (name "rust-codegenrs") + (version "3.0.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "codegenrs" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0hjr5pp099aipm2apcd65a2fp2z6qsixnapsj3rbjgdiyixxzndx")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-clap" ,rust-clap-4) + ("rust-derive-more" ,rust-derive-more-0.99) + ("rust-difference" ,rust-difference-2) + ("rust-normalize-line-endings" ,rust-normalize-line-endings-0.3)))) + (home-page "https://github.com/crate-ci/codegenrs") + (synopsis "Moving code-gen out of build.rs") + (description "Moving code-gen out of build.rs.") + (license (list license:expat license:asl2.0)))) + (define-public rust-codegenrs-2 (package + (inherit rust-codegenrs-3) (name "rust-codegenrs") (version "2.0.0") (source (origin @@ -12114,17 +13638,12 @@ CMAKE environmental variable is set.") (sha256 (base32 "1mld8n8r4ns433gxs2jbndrzqjrxv7v0pwc66pf9a2v2mrgvbv6p")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-clap" ,rust-clap-3) ("rust-derive-more" ,rust-derive-more-0.99) ("rust-difference" ,rust-difference-2) - ("rust-normalize-line-endings" ,rust-normalize-line-endings-0.3)))) - (home-page "https://github.com/crate-ci/codegenrs") - (synopsis "Moving code-gen our of build.rs") - (description "Moving code-gen our of build.rs") - (license (list license:expat license:asl2.0)))) + ("rust-normalize-line-endings" ,rust-normalize-line-endings-0.3)))))) (define-public rust-codespan-reporting-0.11 (package @@ -12192,14 +13711,14 @@ diagnostics easy and relatively painless for everyone!") (define-public rust-codspeed-2 (package (name "rust-codspeed") - (version "2.3.3") + (version "2.4.0") (source (origin (method url-fetch) (uri (crate-uri "codspeed" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "16s95jrih19llp4m8rgmymvan0misfcnzc8gb57ynm35rd6spd0f")))) + (base32 "0ikj07wl9g7az7mnlarmsyjh6a77vm4l2lmwbsbx2h85m9bb11ab")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-colored" ,rust-colored-2) @@ -12214,14 +13733,14 @@ diagnostics easy and relatively painless for everyone!") (define-public rust-codspeed-bencher-compat-2 (package (name "rust-codspeed-bencher-compat") - (version "2.3.3") + (version "2.4.0") (source (origin (method url-fetch) (uri (crate-uri "codspeed-bencher-compat" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "17nmj0yzyyv6450yshs1f2qa0n7d9wwzkcc5ixjkiy63dww2ivpy")))) + (base32 "172c4xkvwbpvjhrx0w6lc4fa250cxdi8fmfvpv6mffghcxaqpr6h")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-bencher" ,rust-bencher-0.1) @@ -12231,6 +13750,31 @@ diagnostics easy and relatively painless for everyone!") (description "Bencher compatibility layer for @code{CodSpeed}.") (license (list license:expat license:asl2.0)))) +(define-public rust-codspeed-criterion-compat-2 + (package + (name "rust-codspeed-criterion-compat") + (version "2.4.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "codspeed-criterion-compat" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1dmhwap6q50a99rsixm2fyghnpr8axwzr8mw558mlcfn2vlrvbh2")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-async-std" ,rust-async-std-1) + ("rust-codspeed" ,rust-codspeed-2) + ("rust-colored" ,rust-colored-2) + ("rust-criterion" ,rust-criterion-0.5) + ("rust-futures" ,rust-futures-0.3) + ("rust-smol" ,rust-smol-1) + ("rust-tokio" ,rust-tokio-1)))) + (home-page "https://codspeed.io") + (synopsis "Criterion.rs compatibility layer for CodSpeed") + (description "Criterion.rs compatibility layer for @code{CodSpeed}.") + (license (list license:expat license:asl2.0)))) + (define-public rust-coitrees-0.2 (package (name "rust-coitrees") @@ -12257,6 +13801,28 @@ diagnostics easy and relatively painless for everyone!") sets of intervals.") (license license:expat))) +(define-public rust-color-backtrace-0.5 + (package + (name "rust-color-backtrace") + (version "0.5.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "color-backtrace" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "11fn3snykx90w3nznzrcf4r164zmhk790asx0kzryf4r7i308v6d")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-atty" ,rust-atty-0.2) + ("rust-backtrace" ,rust-backtrace-0.3) + ("rust-regex" ,rust-regex-1) + ("rust-termcolor" ,rust-termcolor-1)))) + (home-page "https://github.com/athre0z/color-backtrace") + (synopsis "Colorful panic backtraces") + (description "This package provides colorful panic backtraces.") + (license (list license:expat license:asl2.0)))) + (define-public rust-color-eyre-0.6 (package (name "rust-color-eyre") @@ -12589,6 +14155,31 @@ and 1.0.") wrapping.") (license license:expat))) +(define-public rust-comfy-table-6 + (package + (inherit rust-comfy-table-7) + (name "rust-comfy-table") + (version "6.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "comfy-table" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1fmqjhry6xa6a9kr0769wiw06694n60kxs5c6nfvzqv8h9w9v5by")))) + (arguments + `(#:cargo-inputs (("rust-console" ,rust-console-0.15) + ("rust-crossterm" ,rust-crossterm-0.26) + ("rust-strum" ,rust-strum-0.24) + ("rust-strum-macros" ,rust-strum-macros-0.24) + ("rust-unicode-width" ,rust-unicode-width-0.1)) + #:cargo-development-inputs + (("rust-criterion" ,rust-criterion-0.5) + ("rust-pretty-assertions" ,rust-pretty-assertions-1) + ("rust-proptest" ,rust-proptest-1) + ("rust-rand" ,rust-rand-0.8) + ("rust-rstest" ,rust-rstest-0.17)))))) + (define-public rust-comfy-table-4 (package (inherit rust-comfy-table-7) @@ -12628,6 +14219,49 @@ wrapping.") ("rust-strum" ,rust-strum-0.20) ("rust-strum-macros" ,rust-strum-macros-0.20)))))) +(define-public rust-command-group-2 + (package + (name "rust-command-group") + (version "2.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "command-group" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "05lr58pzkpw9rnl3ssi6pv72b9vvjc6z0208ng57djqf1xmxz02h")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-async-trait" ,rust-async-trait-0.1) + ("rust-nix" ,rust-nix-0.26) + ("rust-tokio" ,rust-tokio-1) + ("rust-winapi" ,rust-winapi-0.3)) + #:cargo-development-inputs (("rust-tokio" ,rust-tokio-1)))) + (home-page "https://github.com/watchexec/command-group") + (synopsis "Extension to Command to spawn in a process group") + (description "This package provides an extension to Command to spawn in a +process group.") + (license (list license:asl2.0 license:expat)))) + +(define-public rust-command-group-1 + (package + (inherit rust-command-group-2) + (name "rust-command-group") + (version "1.0.8") + (source + (origin + (method url-fetch) + (uri (crate-uri "command-group" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0b7d9gy9dhw4jqx5x8njzmaifgxqw0nywjry7bgmjjlv81psia7p")))) + (arguments + `(#:cargo-inputs (("rust-async-trait" ,rust-async-trait-0.1) + ("rust-nix" ,rust-nix-0.22) + ("rust-tokio" ,rust-tokio-1) + ("rust-winapi" ,rust-winapi-0.3)) + #:cargo-development-inputs (("rust-tokio" ,rust-tokio-1)))))) + (define-public rust-common-path-1 (package (name "rust-common-path") @@ -12715,6 +14349,26 @@ stores strings on the stack, when possible.") minutes, seconds.") (license license:bsd-3))) +(define-public rust-condtype-1 + (package + (name "rust-condtype") + (version "1.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "condtype" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1by78npyhkc30jccc7kirvwip1fj0jhi2bwfmcw44dqz81xa1w5s")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-development-inputs (("rust-cfg-if" ,rust-cfg-if-1) + ("rust-libc" ,rust-libc-0.2)))) + (home-page "https://github.com/nvzqz/condtype") + (synopsis "Choose types at compile-time via boolean constants") + (description "Choose types at compile-time via boolean constants.") + (license (list license:expat license:asl2.0)))) + (define-public rust-const-cstr-0.3 (package (name "rust-const-cstr") @@ -12798,6 +14452,53 @@ literals.") (description "Implementation detail of the @code{const_format} crate.") (license license:zlib))) +(define-public rust-const-panic-0.2 + (package + (name "rust-const-panic") + (version "0.2.8") + (source + (origin + (method url-fetch) + (uri (crate-uri "const_panic" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "16w72mnzjqgwfhlq8cqm6xhd2n6lc1wan08987izv1pcxhwz4lb0")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-test-flags + '("--release" "--features=test") + #:cargo-inputs + (("rust-const-panic-proc-macros" ,rust-const-panic-proc-macros-0.2) + ("rust-typewit" ,rust-typewit-1)) + #:cargo-development-inputs (("rust-arrayvec" ,rust-arrayvec-0.7) + ("rust-rand" ,rust-rand-0.8)))) + (home-page "https://github.com/rodrimati1992/const_panic/") + (synopsis "Const panic with formatting") + (description "This package provides const panic with formatting.") + (license license:zlib))) + +(define-public rust-const-panic-proc-macros-0.2 + (package + (name "rust-const-panic-proc-macros") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "const_panic_proc_macros" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1addx3a8vi02cdak3ygrqivv02jj73251h85x49aic78yznrhlrr")))) + (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) + ("rust-unicode-xid" ,rust-unicode-xid-0.2)))) + (home-page "https://github.com/rodrimati1992/const_panic/") + (synopsis "Implementation detail of the `const_panic` crate") + (description "Implementation detail of the `const_panic` crate.") + (license license:zlib))) + ;; This package requires features which are unavailable ;; on the stable releases of Rust. (define-public rust-compiler-builtins-0.1 @@ -12885,6 +14586,19 @@ need compiler-rt intrinsics.") Rust compiler.") (license (list license:asl2.0 license:expat)))) +(define-public rust-compiletest-rs-0.9 + (package + (inherit rust-compiletest-rs-0.10) + (name "rust-compiletest-rs") + (version "0.9.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "compiletest_rs" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0wmk12mb8xskdv5mf3p33l2w4w76bcxjx3zlwn94zslaf6xrnj3h")))))) + (define-public rust-compiletest-rs-0.3 (package (inherit rust-compiletest-rs-0.10) @@ -13259,8 +14973,58 @@ queue.") (("rust-easy-parallel" ,rust-easy-parallel-3) ("rust-fastrand" ,rust-fastrand-1)))))) +(define-public rust-config-0.13 + (package + (name "rust-config") + (version "0.13.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "config" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1jjag1x3rl77zjykbrykzhd5fsiv8vy40y4lxkj46xicjw8qwwr3")) + (modules '((guix build utils))) + (snippet + '(begin (substitute* "Cargo.toml" + (("\"= ?([[:digit:]]+(\\.[[:digit:]]+)*)" _ version) + (string-append "\"^" version))))))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-async-trait" ,rust-async-trait-0.1) + ("rust-indexmap" ,rust-indexmap-1) + ("rust-json5" ,rust-json5-0.4) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-nom" ,rust-nom-7) + ("rust-pathdiff" ,rust-pathdiff-0.2) + ("rust-ron" ,rust-ron-0.7) + ("rust-rust-ini" ,rust-rust-ini-0.18) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-toml" ,rust-toml-0.5) + ("rust-yaml-rust" ,rust-yaml-rust-0.4)) + #:cargo-development-inputs (("rust-chrono" ,rust-chrono-0.4) + ("rust-float-cmp" ,rust-float-cmp-0.9) + ("rust-futures" ,rust-futures-0.3) + ("rust-glob" ,rust-glob-0.3) + ("rust-notify" ,rust-notify-4) + ("rust-reqwest" ,rust-reqwest-0.11) + ("rust-serde-derive" ,rust-serde-derive-1) + ("rust-temp-env" ,rust-temp-env-0.2) + ("rust-tokio" ,rust-tokio-1) + ("rust-warp" ,rust-warp-0.3)))) + (native-inputs (list pkg-config)) + (inputs (list openssl)) + (home-page "https://github.com/mehcode/config-rs") + (synopsis "Layered configuration system for Rust applications") + (description + "This package provides a layered configuration system for Rust +applications.") + (license (list license:expat license:asl2.0)))) + (define-public rust-config-0.11 (package + (inherit rust-config-0.13) (name "rust-config") (version "0.11.0") (source @@ -13270,7 +15034,6 @@ queue.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "0sdkxv77m65frsn3bx0r3v7asxar3gy3hmghcfk6h4rbijars6qv")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs @@ -13281,13 +15044,7 @@ queue.") ("rust-serde-hjson" ,rust-serde-hjson-0.9) ("rust-serde-json" ,rust-serde-json-1) ("rust-toml" ,rust-toml-0.5) - ("rust-yaml-rust" ,rust-yaml-rust-0.4)))) - (home-page "https://github.com/mehcode/config-rs") - (synopsis "Layered configuration system for Rust applications") - (description - "This package provides a layered configuration system for Rust -applications.") - (license (list license:expat license:asl2.0)))) + ("rust-yaml-rust" ,rust-yaml-rust-0.4)))))) (define-public rust-config-0.10 (package @@ -13629,7 +15386,7 @@ the browser's console.") (define-public rust-const-fn-0.4 (package (name "rust-const-fn") - (version "0.4.2") + (version "0.4.9") (source (origin (method url-fetch) @@ -13637,7 +15394,7 @@ the browser's console.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1wnhzyrhfcaawnzi172k98cfawwi5zwqql7pg0nz2qlccm6dz46f")))) + "0df9fv9jhnh9b4ni3s2fbfcvq77iia4lbb89fklwawbgv2vdrp7v")))) (build-system cargo-build-system) (home-page "https://github.com/taiki-e/const_fn") (synopsis "Generate const functions with conditional compilations") @@ -13648,14 +15405,14 @@ const functions with conditional compilations.") (define-public rust-const-oid-0.9 (package (name "rust-const-oid") - (version "0.9.2") + (version "0.9.6") (source (origin (method url-fetch) (uri (crate-uri "const-oid" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "04xr993r37hd3kcwzll34kpihxrxj7yhr7fawgir8gs80wyby3sj")))) + "1y0jnqaq7p2wvspnx7qj76m7hjcqpz73qzvr9l2p9n2s51vr6if2")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-arbitrary" ,rust-arbitrary-1)) @@ -13701,17 +15458,18 @@ encoding/decoding as well as heapless no_std (i.e., embedded) support.") (define-public rust-const-random-0.1 (package (name "rust-const-random") - (version "0.1.17") + (version "0.1.18") (source (origin (method url-fetch) (uri (crate-uri "const-random" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "16i9r34f5lmvrmvm5nsssywyjbg3yrqf2hnhrw5h44n6qb4idbss")))) + (base32 "0n8kqz3y82ks8znvz1mxn3a9hadca3amzf33gmi6dc3lzs103q47")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs + `(#:tests? #f ; proc macro panicked + #:cargo-inputs (("rust-const-random-macro" ,rust-const-random-macro-0.1)))) (home-page "https://github.com/tkaitchuck/constrandom") (synopsis "Compile time random number generation") @@ -14007,14 +15765,14 @@ It supports signed and private (encrypted + signed) jars.") (package (inherit rust-cookie-0.16) (name "rust-cookie") - (version "0.15.1") + (version "0.15.2") (source (origin (method url-fetch) (uri (crate-uri "cookie" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "03gql9c2l0wg3hpfp67wg2ns21wysk0xsjxwdbjrf0s6grrcgwfm")))) + (base32 "0hlsi1hv5yrx4g92v5acha6yjz8dy1zj0pbppwynml44qpgjavpw")))) (arguments `(#:cargo-inputs (("rust-aes-gcm" ,rust-aes-gcm-0.8) @@ -14078,24 +15836,23 @@ It supports signed and private (encrypted + signed) jars.") (package (inherit rust-cookie-0.12) (name "rust-cookie") - (version "0.11.3") + (version "0.11.5") (source (origin (method url-fetch) (uri (crate-uri "cookie" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0i2x04kx1ifljsnwsa83k7cpmajk9j4ayyx2h11y6lkji6hcv5ap")))) + (base32 "1mwbcygk9als9h7bfp8fhax2ah278qamaz9l9p64in6iirv1h85y")))) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-aes-gcm" ,rust-aes-gcm-0.5) - ("rust-base64" ,rust-base64-0.12) - ("rust-hkdf" ,rust-hkdf-0.8) - ("rust-hmac" ,rust-hmac-0.7) + `(#: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.7) - ("rust-sha2" ,rust-sha2-0.8) + ("rust-rand" ,rust-rand-0.8) + ("rust-sha2" ,rust-sha2-0.9) ("rust-time" ,rust-time-0.1)))))) (define-public rust-cookie-factory-0.3 @@ -14122,8 +15879,29 @@ It supports signed and private (encrypted + signed) jars.") similar to the nom parser combinators library.") (license license:expat))) +(define-public rust-coolor-0.8 + (package + (name "rust-coolor") + (version "0.8.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "coolor" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1sjrs0k2ng69hilqrrkfayr2rjpwa6b6krp11y3da64zj10kxklm")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t ; Cut the dependency chain. + #:cargo-inputs (("rust-crossterm" ,rust-crossterm-0.23)))) + (home-page "https://github.com/Canop/coolor") + (synopsis "Conversion between color formats") + (description "Conversion between color formats.") + (license license:expat))) + (define-public rust-coolor-0.5 (package + (inherit rust-coolor-0.8) (name "rust-coolor") (version "0.5.1") (source (origin @@ -14133,17 +15911,12 @@ similar to the nom parser combinators library.") (sha256 (base32 "11pvplrm51xjr0mmhwrjaif6vd7p2xpmdbwd0rbx2kr4iq4c4smd")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-crossterm" ,rust-crossterm-0.25)) #:cargo-development-inputs (("rust-crossterm" ,rust-crossterm-0.25) - ("rust-rand" ,rust-rand-0.8)))) - (home-page "https://github.com/Canop/coolor") - (synopsis "conversion between color formats") - (description "conversion between color formats") - (license license:expat))) + ("rust-rand" ,rust-rand-0.8)))))) (define-public rust-copyless-0.1 (package @@ -14231,6 +16004,25 @@ contents of the OS-level clipboard.") numbers using the CORDIC method.") (license license:bsd-3))) +(define-public rust-core-error-0.0.0 + (package + (name "rust-core-error") + (version "0.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "core-error" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "13wvc7lcpi7f6rr0racns4l52gzpix4xhih6qns30hmn5sbv5kgg")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-version-check" ,rust-version-check-0.9)))) + (home-page "https://github.com/core-error/core-error") + (synopsis "std::error::Error for libcore") + (description "std::error::Error for libcore.") + (license (list license:expat license:asl2.0)))) + (define-public rust-core-extensions-1 (package (name "rust-core-extensions") @@ -14469,8 +16261,30 @@ in @code{no_std}. Alloc support is optional.") (("rust-env-logger" ,rust-env-logger-0.7) ("rust-pretty-assertions" ,rust-pretty-assertions-0.6)))))) +(define-public rust-core-affinity-0.8 + (package + (name "rust-core-affinity") + (version "0.8.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "core_affinity" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0113rfzyvjpl1camxnrf92pn9vakhn9zqvgir0wgrqawcgsr4a32")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2) + ("rust-num-cpus" ,rust-num-cpus-1) + ("rust-winapi" ,rust-winapi-0.3)))) + (home-page "https://github.com/Elzair/core_affinity_rs") + (synopsis "Manage CPU affinities") + (description "This package manages CPU affinities.") + (license (list license:expat license:asl2.0)))) + (define-public rust-core-affinity-0.5 (package + (inherit rust-core-affinity-0.8) (name "rust-core-affinity") (version "0.5.10") (source @@ -14480,17 +16294,12 @@ in @code{no_std}. Alloc support is optional.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "07qpwyxps4gp3gci2p6c5h4cmcql7551bp91qgbv0ky3bh8h72kz")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-kernel32-sys" ,rust-kernel32-sys-0.2) ("rust-libc" ,rust-libc-0.2) ("rust-num-cpus" ,rust-num-cpus-1) - ("rust-winapi" ,rust-winapi-0.2)))) - (home-page "https://github.com/Elzair/core_affinity_rs") - (synopsis "Manage CPU affinities") - (description "This package manages CPU affinities.") - (license (list license:expat license:asl2.0)))) + ("rust-winapi" ,rust-winapi-0.2)))))) (define-public rust-core-arch-0.1 (package @@ -14667,6 +16476,24 @@ Supports Linux through either JACK or ALSA.") "This package provides a crate for demangling C++ symbols.") (license (list license:expat license:asl2.0)))) +(define-public rust-cpp-demangle-0.3 + (package + (inherit rust-cpp-demangle-0.4) + (name "rust-cpp-demangle") + (version "0.3.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "cpp_demangle" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "03vi33qz8x7lll0xd3acd3jp39nvzv174wg424qsb1nkm8z9bapf")))) + (arguments + `(#:cargo-inputs (("rust-afl" ,rust-afl-0.11) + ("rust-cfg-if" ,rust-cfg-if-1)) + #:cargo-development-inputs (("rust-clap" ,rust-clap-2) + ("rust-diff" ,rust-diff-0.1)))))) + (define-public rust-cpufeatures-0.2 (package (name "rust-cpufeatures") @@ -14733,40 +16560,6 @@ to the @code{is_x86_feature_detected!} macro.") (description "This package provides bindings to Google's cpu profiler.") (license license:bsd-2))) -(define-public rust-uom-0.34 - (package - (name "rust-uom") - (version "0.34.0") - (source (origin - (method url-fetch) - (uri (crate-uri "uom" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "190n79b5ywa9w0j13ld0q6dphz7vzsjkwrpp8pjnwrczsvfhxxg8")))) - (build-system cargo-build-system) - (arguments - `(#:cargo-inputs (("rust-num-complex" ,rust-num-complex-0.4) - ("rust-num-rational" ,rust-num-rational-0.4) - ("rust-num-traits" ,rust-num-traits-0.2) - ("rust-typenum" ,rust-typenum-1) - ("rust-serde" ,rust-serde-1) - ("rust-num-bigint" ,rust-num-bigint-0.4)) - #:cargo-development-inputs (("rust-approx" ,rust-approx-0.5) - ("rust-quickcheck" ,rust-quickcheck-0.8) - ("rust-serde-json" ,rust-serde-json-1) - ("rust-static-assertions" ,rust-static-assertions-1)))) - (home-page "https://github.com/iliekturtles/uom") - (synopsis "Units of measurement") - (description - "@code{uom} (Units of measurement) is a crate that does automatic type-safe -zero-cost dimensional analysis. You can create your own systems or use the pre-built -International System of Units (SI) which is based on the International System of -Quantities (ISQ) and includes numerous quantities (length, mass, time, ...) with -conversion factors for even more numerous measurement units (meter, kilometer, foot, -mile, ...).") - (license (list license:expat license:asl2.0)))) - (define-public rust-cradle-0.2 (package (name "rust-cradle") @@ -14930,17 +16723,17 @@ mile, ...).") #:cargo-development-inputs (("rust-tempdir" ,rust-tempdir-0.3)))))) -(define-public rust-crates-io-0.39 +(define-public rust-crates-io-0.40 (package (name "rust-crates-io") - (version "0.39.1") + (version "0.40.0") (source (origin (method url-fetch) (uri (crate-uri "crates-io" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1a5i5l9v2khikp3b1cbpqjbx0nhggfq261lpfv3skh9w2210qlx4")))) + (base32 "1y4f7hjs7wq84qcmfcc5mflp00by9vk2ypkfc1wcz2c8zi6qp58r")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-curl" ,rust-curl-0.4) @@ -15037,29 +16830,23 @@ final xor value. It has many built-in CRC functions.") (define-public rust-crc32fast-1 (package (name "rust-crc32fast") - (version "1.3.2") + (version "1.4.0") (source (origin (method url-fetch) (uri (crate-uri "crc32fast" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "03c8f29yx293yf43xar946xbls1g60c207m9drf8ilqhr25vsh5m")))) + (base32 "1ahy259ypc955l5ak24hdlgllb6vm6y2pvwr6qrlyisbg255m1dk")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs - (("rust-cfg-if" ,rust-cfg-if-1)) - #:cargo-development-inputs - (("rust-bencher" ,rust-bencher-0.1) - ("rust-quickcheck" ,rust-quickcheck-1) - ("rust-rand" ,rust-rand-0.4)))) + `(#:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-1)) + #:cargo-development-inputs (("rust-bencher" ,rust-bencher-0.1) + ("rust-quickcheck" ,rust-quickcheck-1) + ("rust-rand" ,rust-rand-0.8)))) (home-page "https://github.com/srijs/rust-crc32fast") - (synopsis - "Fast, SIMD-accelerated CRC32 (IEEE) checksum computation") - (description - "Fast, SIMD-accelerated CRC32 (IEEE) checksum computation.") + (synopsis "Fast, SIMD-accelerated CRC32 (IEEE) checksum computation") + (description "Fast, SIMD-accelerated CRC32 (IEEE) checksum computation.") (license (list license:expat license:asl2.0)))) (define-public rust-crc64-2 @@ -15546,20 +17333,20 @@ message passing.") (define-public rust-crossbeam-deque-0.8 (package (name "rust-crossbeam-deque") - (version "0.8.3") + (version "0.8.5") (source (origin (method url-fetch) (uri (crate-uri "crossbeam-deque" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1vqczbcild7nczh5z116w8w46z991kpjyw7qxkf24c14apwdcvyf")))) + "03bp38ljx4wj6vvy4fbhx41q8f585zyqix6pncz1mkz93z08qgv1")))) (build-system cargo-build-system) (arguments `(#: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)))) + (("rust-crossbeam-epoch" ,rust-crossbeam-epoch-0.9) + ("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/tree/master/crossbeam-deque") (synopsis "Concurrent work-stealing deque") @@ -15591,29 +17378,20 @@ message passing.") (define-public rust-crossbeam-epoch-0.9 (package (name "rust-crossbeam-epoch") - (version "0.9.15") + (version "0.9.18") (source (origin (method url-fetch) (uri (crate-uri "crossbeam-epoch" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1ixwc3cq816wb8rlh3ix4jnybqbyyq4l61nwlx0mfm3ck0s148df")))) + (base32 "03j2np8llwf376m3fxqx859mgp9f83hj1w34153c7a9c7i5ar0jv")))) (build-system cargo-build-system) (arguments - `(#:cargo-test-flags - (list "--release" "--" - "--skip=guard::unprotected") - #:cargo-inputs - (("rust-autocfg" ,rust-autocfg-1) - ("rust-cfg-if" ,rust-cfg-if-1) - ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.8) - ("rust-loom" ,rust-loom-0.5) - ("rust-memoffset" ,rust-memoffset-0.9) - ("rust-scopeguard" ,rust-scopeguard-1)) - #:cargo-development-inputs - (("rust-rand" ,rust-rand-0.8) - ("rust-rustversion" ,rust-rustversion-1)))) + `(#:cargo-inputs + (("rust-crossbeam-utils" ,rust-crossbeam-utils-0.8) + ("rust-loom" ,rust-loom-0.7)) + #:cargo-development-inputs (("rust-rand" ,rust-rand-0.8)))) (home-page "https://github.com/crossbeam-rs/crossbeam/tree/master/crossbeam-epoch") (synopsis "Epoch-based garbage collection") @@ -16087,29 +17865,27 @@ abstractions around common WinAPI calls.") #:cargo-inputs (("rust-winapi" ,rust-winapi-0.3)))))) -(define-public rust-crosstermion-0.11 +(define-public rust-crosstermion-0.13 (package (name "rust-crosstermion") - (version "0.11.0") + (version "0.13.0") (source (origin (method url-fetch) (uri (crate-uri "crosstermion" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0jbpxv2h08a1rvpw42iq59l2y0xbqvzpdq09043i8ihdc9nz8bhm")))) + (base32 "1q877s6rfm4n4amsg79ihxi583lhmlnq57hj9sg1ph2ddyw1a120")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs - (("rust-ansi-term" ,rust-ansi-term-0.12) - ("rust-async-channel" ,rust-async-channel-1) - ("rust-crossterm" ,rust-crossterm-0.26) - ("rust-futures-channel" ,rust-futures-channel-0.3) - ("rust-futures-core" ,rust-futures-core-0.3) - ("rust-futures-lite" ,rust-futures-lite-1) - ("rust-ratatui" ,rust-ratatui-0.20) - ("rust-termion" ,rust-termion-2) - ("rust-tui-react" ,rust-tui-react-0.20)))) + `(#:cargo-inputs (("rust-ansiterm" ,rust-ansiterm-0.12) + ("rust-async-channel" ,rust-async-channel-2) + ("rust-crossterm" ,rust-crossterm-0.27) + ("rust-futures-channel" ,rust-futures-channel-0.3) + ("rust-futures-core" ,rust-futures-core-0.3) + ("rust-futures-lite" ,rust-futures-lite-2) + ("rust-ratatui" ,rust-ratatui-0.25) + ("rust-tui-react" ,rust-tui-react-0.22)))) (home-page "https://github.com/Byron/tui-crates") (synopsis "Unification of crossterm and termion behind a common facade") (description @@ -16117,6 +17893,29 @@ abstractions around common WinAPI calls.") feature flags.") (license license:expat))) +(define-public rust-crosstermion-0.11 + (package + (inherit rust-crosstermion-0.13) + (name "rust-crosstermion") + (version "0.11.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "crosstermion" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0jbpxv2h08a1rvpw42iq59l2y0xbqvzpdq09043i8ihdc9nz8bhm")))) + (arguments + `(#:cargo-inputs (("rust-ansi-term" ,rust-ansi-term-0.12) + ("rust-async-channel" ,rust-async-channel-1) + ("rust-crossterm" ,rust-crossterm-0.26) + ("rust-futures-channel" ,rust-futures-channel-0.3) + ("rust-futures-core" ,rust-futures-core-0.3) + ("rust-futures-lite" ,rust-futures-lite-1) + ("rust-ratatui" ,rust-ratatui-0.20) + ("rust-termion" ,rust-termion-2) + ("rust-tui-react" ,rust-tui-react-0.20)))))) + (define-public rust-crunchy-0.2 (package (name "rust-crunchy") @@ -16137,172 +17936,86 @@ feature flags.") number ``crunching``.") (license license:expat))) -(define-public rust-rodio-0.15 +(define-public rust-csscolorparser-0.6 (package - (name "rust-rodio") - (version "0.15.0") + (name "rust-csscolorparser") + (version "0.6.2") (source (origin (method url-fetch) - (uri (crate-uri "rodio" version)) + (uri (crate-uri "csscolorparser" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "07kkrx0hxfcqgkpg0lrh9355bj1rl0k65nwsk3qwdri6yvlkj2gc")))) + (base32 "1gxh11hajx96mf5sd0az6mfsxdryfqvcfcphny3yfbfscqq7sapb")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs (("rust-claxon" ,rust-claxon-0.4) - ("rust-cpal" ,rust-cpal-0.13) - ("rust-hound" ,rust-hound-3) - ("rust-lewton" ,rust-lewton-0.10) - ("rust-minimp3" ,rust-minimp3-0.5) - ("rust-symphonia" ,rust-symphonia-0.4)) - #:cargo-development-inputs (("rust-quickcheck" ,rust-quickcheck-0.9)))) - (native-inputs (list pkg-config)) - (inputs (list alsa-lib)) - (home-page "https://github.com/RustAudio/rodio") - (synopsis "Pure Rust audio playback library") - (description "Audio playback library written in pure Rust that supports -many formats including AAC, FLAC, MP3, MP4 and WAV.") + `(#:cargo-inputs (("rust-cint" ,rust-cint-0.3) + ("rust-lab" ,rust-lab-0.11) + ("rust-phf" ,rust-phf-0.11) + ("rust-rgb" ,rust-rgb-0.8) + ("rust-serde" ,rust-serde-1)) + #:cargo-development-inputs (("rust-serde-test" ,rust-serde-test-1)))) + (home-page "https://github.com/mazznoer/csscolorparser-rs") + (synopsis "CSS color parser library") + (description "This crate is a CSS color parser library.") (license (list license:expat license:asl2.0)))) -(define-public rust-roxmltree-0.14 +(define-public rust-cssparser-0.33 (package - (name "rust-roxmltree") - (version "0.14.0") + (name "rust-cssparser") + (version "0.33.0") (source (origin (method url-fetch) - (uri (crate-uri "roxmltree" version)) + (uri (crate-uri "cssparser" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "010mahzyarkzb7kaawgga1a9y46nsp209yh2i4g4pq98bg8afn5z")))) + (base32 "07i8k47fmym7kzs95qfhg6zrh4yyf2vl4460rmdyvyx06vck9scv")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-xmlparser" ,rust-xmlparser-0.13)))) - (home-page "https://github.com/RazrFalcon/roxmltree") - (synopsis "Represent an XML as a read-only tree") - (description - "@code{roxmltree} represents an XML 1.0 document as a read-only tree.") - (license (list license:expat license:asl2.0)))) - -(define-public rust-rtoolbox-0.0.1 - (package - (name "rust-rtoolbox") - (version "0.0.1") - (source (origin - (method url-fetch) - (uri (crate-uri "rtoolbox" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "0jjjngwn1fa39kschc8zb4hynp4b0jdind7z225cph7m2k2j4kh3")))) - (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-libc" ,rust-libc-0.2) - ("rust-serde" ,rust-serde-1) - ("rust-serde-json" ,rust-serde-json-1) - ("rust-winapi" ,rust-winapi-0.3)))) - (home-page "") - (synopsis "Utility functions for other crates") + `(#:tests? #f ; Not all files included in the tarball. + #:cargo-inputs (("rust-cssparser-macros" ,rust-cssparser-macros-0.6) + ("rust-dtoa-short" ,rust-dtoa-short-0.3) + ("rust-itoa" ,rust-itoa-1) + ("rust-phf" ,rust-phf-0.8) + ("rust-serde" ,rust-serde-1) + ("rust-smallvec" ,rust-smallvec-1)) + #:cargo-development-inputs (("rust-difference" ,rust-difference-2) + ("rust-encoding-rs" ,rust-encoding-rs-0.8) + ("rust-serde-json" ,rust-serde-json-1)))) + (home-page "https://github.com/servo/rust-cssparser") + (synopsis "Rust implementation of CSS Syntax Level 3") (description - "This package provides utility functions for other crates with no -backwards compatibility guarantees.") - (license license:asl2.0))) - -(define-public rust-rt-format-0.3 - (package - (name "rust-rt-format") - (version "0.3.1") - (source - (origin - (method url-fetch) - (uri (crate-uri "rt-format" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 "1qjjwh9ny95xck1kp99gi6hfm9glrx54jx8npnj6yccxc7p7q225")))) - (build-system cargo-build-system) - (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-lazy-static" ,rust-lazy-static-1) - ("rust-regex" ,rust-regex-1)))) - (home-page "https://github.com/vstojkovic/rt-format") - (synopsis "Runtime equivalent of the Rust format! macro") - (description "This package provides a runtime equivalent of the Rust -format! macro. It allows formatting strings like the format! macro, with the -formatting string and the arguments provided at runtime. This crate supports -all the formatting features of the format! macro, except for the fill -character.") - (license license:asl2.0))) + "This package contains a Rust implementation of CSS Syntax Level 3.") + (license license:mpl2.0))) -(define-public rust-rtnetlink-0.14 +(define-public rust-cssparser-0.31 (package - (name "rust-rtnetlink") - (version "0.14.1") + (inherit rust-cssparser-0.33) + (name "rust-cssparser") + (version "0.31.2") (source (origin (method url-fetch) - (uri (crate-uri "rtnetlink" version)) + (uri (crate-uri "cssparser" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "19dbbky7bcrwk4jhgam148s8ykxc7pfrblxjvmciipyq8i9lg15n")))) - (build-system cargo-build-system) + (base32 "1gnmn2wjvhvkj98ygcd5jdwi0wxsigvd7j0yq0zfgfsz7vwz8gav")))) (arguments - `(#:cargo-test-flags '("--release" "--" - "--skip=link::test::create_get_delete_macvlan" - "--skip=link::test::create_get_delete_wg" - "--skip=traffic_control::add_filter::test::test_new_filter" - "--skip=traffic_control::add_qdisc::test::test_new_qdisc") - #:cargo-inputs (("rust-async-global-executor" ,rust-async-global-executor-2) - ("rust-futures" ,rust-futures-0.3) - ("rust-log" ,rust-log-0.4) - ("rust-netlink-packet-core" ,rust-netlink-packet-core-0.7) - ("rust-netlink-packet-route" ,rust-netlink-packet-route-0.19) - ("rust-netlink-packet-utils" ,rust-netlink-packet-utils-0.5) - ("rust-netlink-proto" ,rust-netlink-proto-0.11) - ("rust-netlink-sys" ,rust-netlink-sys-0.8) - ("rust-nix" ,rust-nix-0.27) - ("rust-thiserror" ,rust-thiserror-1) - ("rust-tokio" ,rust-tokio-1)) - #:cargo-development-inputs (("rust-async-std" ,rust-async-std-1) - ("rust-env-logger" ,rust-env-logger-0.10) - ("rust-ipnetwork" ,rust-ipnetwork-0.18) - ("rust-macaddr" ,rust-macaddr-1) - ("rust-tokio" ,rust-tokio-1)))) - (home-page "https://github.com/rust-netlink/rtnetlink") - (synopsis "Manipulate linux networking resources via netlink") - (description "This crate provides methods to manipulate networking -resources (links, addresses, arp tables, route tables) via the netlink route -protocol.") - (license license:expat))) - -(define-public rust-rusticata-macros-4 - (package - (name "rust-rusticata-macros") - (version "4.0.0") - (source - (origin - (method url-fetch) - (uri (crate-uri "rusticata-macros" version)) - (file-name - (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "03dmfxhgwzpm1360iwcpcg3y18ddgya0i0hc599am212pdvj7ib5")))) - (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-nom" ,rust-nom-7)))) - (home-page "https://github.com/rusticata/rusticata-macros") - (synopsis "Helper macros for Rusticata") - (description "Helper macros for Rusticata.") - (license (list license:expat license:asl2.0)))) + `(#:tests? #f ; Not all files included in the tarball. + #:cargo-inputs (("rust-cssparser-macros" ,rust-cssparser-macros-0.6) + ("rust-dtoa-short" ,rust-dtoa-short-0.3) + ("rust-itoa" ,rust-itoa-1) + ("rust-phf" ,rust-phf-0.8) + ("rust-serde" ,rust-serde-1) + ("rust-smallvec" ,rust-smallvec-1)) + #:cargo-development-inputs (("rust-difference" ,rust-difference-2) + ("rust-encoding-rs" ,rust-encoding-rs-0.8) + ("rust-serde-json" ,rust-serde-json-1)))))) (define-public rust-cssparser-0.29 (package + (inherit rust-cssparser-0.33) (name "rust-cssparser") (version "0.29.6") (source @@ -16312,7 +18025,6 @@ protocol.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "1yp0zl5cmw9x95np9a51153fdb1ng8fgzwyssg7hr5dmki0h6ggr")))) - (build-system cargo-build-system) (arguments `(#:tests? #f ; Not all files included in the tarball. #:cargo-inputs @@ -16329,12 +18041,7 @@ protocol.") #:cargo-development-inputs (("rust-difference" ,rust-difference-2) ("rust-encoding-rs" ,rust-encoding-rs-0.8) - ("rust-serde-json" ,rust-serde-json-1)))) - (home-page "https://github.com/servo/rust-cssparser") - (synopsis "Rust implementation of CSS Syntax Level 3") - (description - "This package contains a Rust implementation of CSS Syntax Level 3.") - (license license:mpl2.0))) + ("rust-serde-json" ,rust-serde-json-1)))))) (define-public rust-cssparser-0.28 (package @@ -16397,27 +18104,59 @@ protocol.") (define-public rust-cssparser-macros-0.6 (package (name "rust-cssparser-macros") - (version "0.6.0") + (version "0.6.1") (source (origin (method url-fetch) (uri (crate-uri "cssparser-macros" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "0vp13g4blyjvhg3j4r9b7vrwhnfi1y2fmhv8hxgficpjazg7bbnz")))) + (base32 "0cfkzj60avrnskdmaf7f8zw6pp3di4ylplk455zrzaf19ax8id8k")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs - (("rust-quote" ,rust-quote-1) - ("rust-syn" ,rust-syn-1)))) + `(#:cargo-test-flags '("--release" "--" + "--skip=match_byte") + #:cargo-inputs (("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-2)))) (home-page "https://github.com/servo/rust-cssparser") (synopsis "Procedural macros for cssparser") (description "This package provides the procedural macros for rust-cssparser.") (license license:mpl2.0))) +(define-public rust-csv-async-1 + (package + (name "rust-csv-async") + (version "1.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "csv-async" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1w60k4pqm1lnbv0mbz1d1ypmkx487r0q36hyrrh84jkzs2qfazyk")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; Errors in the test suite code. + #:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-1) + ("rust-csv-core" ,rust-csv-core-0.1) + ("rust-futures" ,rust-futures-0.3) + ("rust-itoa" ,rust-itoa-1) + ("rust-ryu" ,rust-ryu-1) + ("rust-serde" ,rust-serde-1) + ("rust-tokio" ,rust-tokio-1) + ("rust-tokio-stream" ,rust-tokio-stream-0.1)) + #:cargo-development-inputs (("rust-async-std" ,rust-async-std-1) + ("rust-bstr" ,rust-bstr-1) + ("rust-chrono" ,rust-chrono-0.4) + ("rust-indoc" ,rust-indoc-2) + ("rust-serde" ,rust-serde-1) + ("rust-tokio" ,rust-tokio-1)))) + (home-page "https://github.com/gwierzchowski/csv-async") + (synopsis "CSV parsing for async") + (description "This package provides CSV parsing for async.") + (license license:expat))) + (define-public rust-csv-index-0.1 (package (name "rust-csv-index") @@ -16504,6 +18243,28 @@ protocol.") (description "Bare bones CSV parsing with no_std support.") (license (list license:unlicense license:expat)))) +(define-public rust-cstr-0.2 + (package + (name "rust-cstr") + (version "0.2.12") + (source + (origin + (method url-fetch) + (uri (crate-uri "cstr" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0dj6ll9ry27kn4k0vvhlvbhn9dyyr9haxnd06bxaqnmfr01kjlk8")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1)) + #:cargo-development-inputs (("rust-trybuild" ,rust-trybuild-1)))) + (home-page "https://github.com/upsuper/cstr") + (synopsis "Macro for building static CStr reference") + (description + "This package provides the macro for building static CStr reference.") + (license license:expat))) + (define-public rust-cstr-core-0.2 (package (name "rust-cstr-core") @@ -16588,14 +18349,14 @@ use with sct crate.") (define-public rust-ctor-0.2 (package (name "rust-ctor") - (version "0.2.0") + (version "0.2.7") (source (origin (method url-fetch) (uri (crate-uri "ctor" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "06rhrw85py0gkk7g99qk124mk6d5isq95nn3abc84fyf7zv5ch6x")))) + "0p289www67xwnxsqgvlh3mzi0zmdysxsqf4cx2kvgfcj96kiladd")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -16722,14 +18483,14 @@ use with bindgen.") (define-public rust-curl-0.4 (package (name "rust-curl") - (version "0.4.44") + (version "0.4.46") (source (origin (method url-fetch) (uri (crate-uri "curl" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "08hsq6ssy228df56adv2wbgam05f5rw1f2wzs7mhkb678qbx36sh")))) + (base32 "1dk7xi1fv57ak5wsgzig702czv3ssrgyk120b7qhy2dsdvfn288y")))) (build-system cargo-build-system) (arguments `(#:tests? #false ;require internet access @@ -16739,8 +18500,8 @@ use with bindgen.") ("rust-openssl-probe" ,rust-openssl-probe-0.1) ("rust-openssl-sys" ,rust-openssl-sys-0.9) ("rust-schannel" ,rust-schannel-0.1) - ("rust-socket2" ,rust-socket2-0.4) - ("rust-winapi" ,rust-winapi-0.3)) + ("rust-socket2" ,rust-socket2-0.5) + ("rust-windows-sys" ,rust-windows-sys-0.52)) #:cargo-development-inputs (("rust-anyhow" ,rust-anyhow-1) ("rust-mio" ,rust-mio-0.6) @@ -16759,7 +18520,7 @@ requests.") (define-public rust-curl-sys-0.4 (package (name "rust-curl-sys") - (version "0.4.70+curl-8.5.0") + (version "0.4.72+curl-8.6.0") (source (origin (method url-fetch) @@ -16767,7 +18528,7 @@ requests.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "07l45np3bs10ana73w1ahdax1zbb8jd44ahhr2j7izlshkc360rw")) + "1sn97cah732ldcwkw5knm6kh57hx0gfxqmniiwgd2iy42j1xrjr9")) (modules '((guix build utils))) (snippet '(begin (delete-file-recursively "curl"))))) @@ -16782,7 +18543,7 @@ requests.") ("rust-pkg-config" ,rust-pkg-config-0.3) ("rust-rustls-ffi" ,rust-rustls-ffi-0.8) ("rust-vcpkg" ,rust-vcpkg-0.2) - ("rust-windows-sys" ,rust-windows-sys-0.48)))) + ("rust-windows-sys" ,rust-windows-sys-0.52)))) (native-inputs (list pkg-config)) (inputs @@ -17319,24 +19080,20 @@ into structs when implementing custom derives.") (package (inherit rust-darling-0.14) (name "rust-darling") - (version "0.13.1") + (version "0.13.4") (source (origin (method url-fetch) (uri (crate-uri "darling" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1x7pgzjswg28798zd5gk5g6nifhcaqq0apqmclydi39zd2w21myh")))) + (base32 "0g25pad4mhq7315mw9n4wpg8j3mwyhwvr541kgdl0aar1j2ra7d0")))) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-darling-core" ,rust-darling-core-0.13) - ("rust-darling-macro" ,rust-darling-macro-0.13)) - #:cargo-development-inputs - (("rust-proc-macro2" ,rust-proc-macro2-1) - ("rust-quote" ,rust-quote-1) - ("rust-syn" ,rust-syn-1)))))) + `(#:cargo-inputs (("rust-darling-core" ,rust-darling-core-0.13) + ("rust-darling-macro" ,rust-darling-macro-0.13)) + #:cargo-development-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)))))) (define-public rust-darling-0.12 (package @@ -17464,23 +19221,21 @@ reading attributes into structs when implementing custom derives.") (package (inherit rust-darling-core-0.14) (name "rust-darling-core") - (version "0.13.1") + (version "0.13.4") (source (origin (method url-fetch) (uri (crate-uri "darling_core" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0933k2avb6xk9j4ryr0bvp3pww5j8i0nrqvsnkgd3vic3lj0yd3s")))) + (base32 "046n83f9jpszlngpjxkqi39ayzxf5a35q673c69jr1dn0ylnb7c5")))) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-fnv" ,rust-fnv-1) - ("rust-ident-case" ,rust-ident-case-1) - ("rust-proc-macro2" ,rust-proc-macro2-1) - ("rust-quote" ,rust-quote-1) - ("rust-strsim" ,rust-strsim-0.10) - ("rust-syn" ,rust-syn-1)))))) + `(#:cargo-inputs (("rust-fnv" ,rust-fnv-1) + ("rust-ident-case" ,rust-ident-case-1) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-strsim" ,rust-strsim-0.10) + ("rust-syn" ,rust-syn-1)))))) (define-public rust-darling-core-0.12 (package @@ -17592,20 +19347,18 @@ custom derives.") (package (inherit rust-darling-macro-0.14) (name "rust-darling-macro") - (version "0.13.1") + (version "0.13.4") (source - (origin - (method url-fetch) - (uri (crate-uri "darling_macro" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 "0jzljnd0y7idi5lb7lhvymh3nkhaf32ksx0d38hv7zjjfcxipi3j")))) + (origin + (method url-fetch) + (uri (crate-uri "darling_macro" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0d8q8ibmsb1yzby6vwgh2wx892jqqfv9clwhpm19rprvz1wjd5ww")))) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-darling-core" ,rust-darling-core-0.13) - ("rust-quote" ,rust-quote-1) - ("rust-syn" ,rust-syn-1)))))) + `(#:cargo-inputs (("rust-darling-core" ,rust-darling-core-0.13) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)))))) (define-public rust-darling-macro-0.12 (package @@ -17667,6 +19420,30 @@ custom derives.") ("rust-quote" ,rust-quote-0.6) ("rust-syn" ,rust-syn-0.15)))))) +(define-public rust-dary-heap-0.3 + (package + (name "rust-dary-heap") + (version "0.3.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "dary_heap" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1jm04p72s7xij3cr71h59dw07s63nah5b10sh8akcr2129zx2qkp")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-serde" ,rust-serde-1)) + #:cargo-development-inputs + (("rust-criterion" ,rust-criterion-0.4) + ("rust-rand" ,rust-rand-0.8) + ("rust-rand-xorshift" ,rust-rand-xorshift-0.3) + ("rust-serde-test" ,rust-serde-test-1)))) + (home-page "https://github.com/hanmertens/dary_heap") + (synopsis "D-ary heap") + (description "This package provides a d-ary heap.") + (license (list license:expat license:asl2.0)))) + (define-public rust-dashmap-5 (package (name "rust-dashmap") @@ -17736,29 +19513,87 @@ for Rust.") hexadecimal, base32, and base64.") (license license:expat))) -(define-public rust-data-url-0.2 +(define-public rust-data-encoding-macro-0.1 + (package + (name "rust-data-encoding-macro") + (version "0.1.14") + (source + (origin + (method url-fetch) + (uri (crate-uri "data-encoding-macro" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0gnkqpd3h24wy272vpdphp7z6gcbq9kyn8df5ggyyaglyl31rh10")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-data-encoding" ,rust-data-encoding-2) + ("rust-data-encoding-macro-internal" + ,rust-data-encoding-macro-internal-0.1)))) + (home-page "https://github.com/ia0/data-encoding") + (synopsis "Macros for data-encoding") + (description "This package provides macros for data-encoding.") + (license license:expat))) + +(define-public rust-data-encoding-macro-internal-0.1 + (package + (name "rust-data-encoding-macro-internal") + (version "0.1.12") + (source + (origin + (method url-fetch) + (uri (crate-uri "data-encoding-macro-internal" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1wvn4p7wzr6p8fy8q9qpzgbvb9j1k3b5016867b7vcc95izx0iq0")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-data-encoding" ,rust-data-encoding-2) + ("rust-syn" ,rust-syn-1)))) + (home-page "https://github.com/ia0/data-encoding") + (synopsis "Internal library for data-encoding-macro") + (description + "This package provides an internal library for data-encoding-macro.") + (license license:expat))) + +(define-public rust-data-url-0.3 (package (name "rust-data-url") - (version "0.2.0") + (version "0.3.1") (source (origin (method url-fetch) (uri (crate-uri "data-url" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "19828d6jby17ghi7vr0zia9sy3hlvvjbngrcsllmfh2zfg1kjx4d")))) + (base32 "0ahclz72myi350cs1xcsxdh1v0iljpfj4ghcy2fy46mpfhf7laaw")))) (build-system cargo-build-system) (arguments - `(#:cargo-development-inputs - (("rust-serde" ,rust-serde-1) - ("rust-serde-json" ,rust-serde-json-1) - ("rust-tester" ,rust-tester-0.9)))) + `(#:cargo-development-inputs (("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-tester" ,rust-tester-0.9)))) (home-page "https://github.com/servo/rust-url") (synopsis "Processing of data: URL according to WHATWG's Fetch Standard") (description "Processing of data: URL according to WHATWG's Fetch Standard.") (license (list license:expat license:asl2.0)))) +(define-public rust-data-url-0.2 + (package + (inherit rust-data-url-0.3) + (name "rust-data-url") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "data-url" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "19828d6jby17ghi7vr0zia9sy3hlvvjbngrcsllmfh2zfg1kjx4d")))) + (arguments + `(#:cargo-development-inputs (("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-tester" ,rust-tester-0.9)))))) + (define-public rust-datetime-0.5 (package (name "rust-datetime") @@ -17925,8 +19760,40 @@ sizes. Big-endian order is used. WARNING: Block must be aligned!") "This crate is a framework for writing D-Bus method handlers (legacy).") (license (list license:asl2.0 license:expat)))) +(define-public rust-deadpool-0.9 + (package + (name "rust-deadpool") + (version "0.9.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "deadpool" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0vl5qg5pfx0c9c41g299clfdgz9la6z8361aycb21cia1zwy07s2")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-async-trait" ,rust-async-trait-0.1) + ("rust-deadpool-runtime" ,rust-deadpool-runtime-0.1) + ("rust-num-cpus" ,rust-num-cpus-1) + ("rust-retain-mut" ,rust-retain-mut-0.1) + ("rust-serde" ,rust-serde-1) + ("rust-tokio" ,rust-tokio-1)) + #:cargo-development-inputs (("rust-async-std" ,rust-async-std-1) + ("rust-config" ,rust-config-0.13) + ("rust-criterion" ,rust-criterion-0.3) + ("rust-itertools" ,rust-itertools-0.10) + ("rust-tokio" ,rust-tokio-1)))) + (home-page "https://github.com/bikeshedder/deadpool") + (synopsis "Dead simple async pool") + (description + "Deadpool is a dead simple async pool for connections and objects +of any type.") + (license (list license:expat license:asl2.0)))) + (define-public rust-deadpool-0.7 (package + (inherit rust-deadpool-0.9) (name "rust-deadpool") (version "0.7.0") (source @@ -17936,7 +19803,6 @@ sizes. Big-endian order is used. WARNING: Block must be aligned!") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "0vb18xvhmyg6gvvq5vrcqmy4x26ryrmkqpsgwmb4bvkav1wn24ix")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs @@ -17945,12 +19811,48 @@ sizes. Big-endian order is used. WARNING: Block must be aligned!") ("rust-crossbeam-queue" ,rust-crossbeam-queue-0.3) ("rust-num-cpus" ,rust-num-cpus-1) ("rust-serde" ,rust-serde-1) - ("rust-tokio" ,rust-tokio-1)))) + ("rust-tokio" ,rust-tokio-1)))))) + +(define-public rust-deadpool-runtime-0.1 + (package + (name "rust-deadpool-runtime") + (version "0.1.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "deadpool-runtime" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0j9zmm37z6m4fnkf40z6qwidi4z1gwk0piqzx7yz6riazrjakpv3")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-async-std" ,rust-async-std-1) + ("rust-tokio" ,rust-tokio-1)))) (home-page "https://github.com/bikeshedder/deadpool") - (synopsis "Dead simple async pool") - (description - "Deadpool is a dead simple async pool for connections and objects of any -type.") + (synopsis "Dead simple async pool utitities for sync managers") + (description "This package provides dead simple async pool utitities +for sync managers.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-deadpool-sync-0.1 + (package + (name "rust-deadpool-sync") + (version "0.1.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "deadpool-sync" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "02habnbf9gna5yg5parpfbgz1342mzyxmd5lcz7f9jhk9i4p1nzq")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-deadpool-runtime" ,rust-deadpool-runtime-0.1) + ("rust-tracing" ,rust-tracing-0.1)))) + (home-page "https://github.com/bikeshedder/deadpool") + (synopsis "Dead simple async pool utitities for sync managers") + (description "This package provides dead simple async pool utitities +for sync managers.") (license (list license:expat license:asl2.0)))) (define-public rust-debug-helper-0.3 @@ -18290,20 +20192,23 @@ written in rust.") (define-public rust-defmt-0.3 (package (name "rust-defmt") - (version "0.3.0") + (version "0.3.6") (source (origin (method url-fetch) (uri (crate-uri "defmt" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "181l5wv6sihrjwjvk97wznmg2iaz3w1ljsx2dfzjssmhsbs5vyv2")))) + (base32 "15a53435jpy9jj3g49mxp94g961zslggbin2nd9f2va20wlmaf9r")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t + `(#:cargo-test-flags '("--release" "--features=unstable-test") #:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) - ("rust-defmt-macros" ,rust-defmt-macros-0.3)))) + ("rust-defmt-macros" ,rust-defmt-macros-0.3)) + #:cargo-development-inputs + (("rust-rustc-version" ,rust-rustc-version-0.4) + ("rust-trybuild" ,rust-trybuild-1)))) (home-page "https://knurling.ferrous-systems.com/") (synopsis "Logging framework for resource-constrained devices") (description @@ -18314,23 +20219,26 @@ resource-constrained devices, like micro-controllers.") (define-public rust-defmt-macros-0.3 (package (name "rust-defmt-macros") - (version "0.3.1") + (version "0.3.7") (source (origin (method url-fetch) (uri (crate-uri "defmt-macros" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0rx25gp12c6j3krwjjsknigd803ycz1rpxh5jhr6ny51cfvrd0q9")))) + (base32 "1nmvni24vfrcqaaaa95ag278sfm7sdshw94mkvhi7i1ap6kwgg8q")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-defmt-parser" ,rust-defmt-parser-0.3) ("rust-proc-macro-error" ,rust-proc-macro-error-1) ("rust-proc-macro2" ,rust-proc-macro2-1) ("rust-quote" ,rust-quote-1) - ("rust-syn" ,rust-syn-1)))) + ("rust-syn" ,rust-syn-2)) + #:cargo-development-inputs + (("rust-maplit" ,rust-maplit-1) + ("rust-pretty-assertions" ,rust-pretty-assertions-1) + ("rust-rstest" ,rust-rstest-0.17)))) (home-page "https://github.com/knurling-rs/defmt") (synopsis "Macros for rust-defmt") (description "This package provides macros for rust-defmt crate") @@ -18339,16 +20247,18 @@ resource-constrained devices, like micro-controllers.") (define-public rust-defmt-parser-0.3 (package (name "rust-defmt-parser") - (version "0.3.0") + (version "0.3.4") (source (origin (method url-fetch) (uri (crate-uri "defmt-parser" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1is90zrcifdky4rpra450779c3jf3bc2xwcqbj9fy6m5w48f074d")))) + (base32 "03zpg0i6vlalw7m976z66n70s041rvwii8qn3grxgs1hwgpmyjpz")))) (build-system cargo-build-system) - (arguments `(#:skip-build? #t)) + (arguments + `(#:cargo-inputs (("rust-thiserror" ,rust-thiserror-1)) + #:cargo-development-inputs (("rust-rstest" ,rust-rstest-0.17)))) (home-page "https://github.com/knurling-rs/defmt") (synopsis "Parsing library for defmt format strings") (description "This package is a parsing library for defmt format @@ -18482,20 +20392,20 @@ Rust.") (define-public rust-derive-arbitrary-1 (package (name "rust-derive-arbitrary") - (version "1.3.0") + (version "1.3.2") (source (origin (method url-fetch) (uri (crate-uri "derive_arbitrary" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1dy8pmv7d8diqhbh1b88v8q5g0inwkgb465877jqimbjqjgfpkgk")))) + "04bnd985frl81r5sgixgpvncnnj1bfpfnd7qvdx1aahnqi9pbrv7")))) (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)))) + ("rust-syn" ,rust-syn-2)))) (home-page "https://github.com/rust-fuzz/arbitrary") (synopsis "Derives arbitrary traits") (description "This crate implements support for automatically deriving the @@ -18504,7 +20414,8 @@ Instead, enable the @code{derive} feature of the @code{arbitrary} crate.") (license (list license:expat license:asl2.0)))) (define-public rust-derive-arbitrary-0.4 - (package/inherit rust-derive-arbitrary-1 + (package + (inherit rust-derive-arbitrary-1) (name "rust-derive-arbitrary") (version "0.4.7") (source @@ -18513,23 +20424,27 @@ Instead, enable the @code{derive} feature of the @code{arbitrary} crate.") (uri (crate-uri "derive_arbitrary" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1rp0z4k0j5ip0bx6dssg97l4q6bakhf6lm5h1lpr3p3kwjsi585i")))))) + (base32 "1rp0z4k0j5ip0bx6dssg97l4q6bakhf6lm5h1lpr3p3kwjsi585i")))) + (arguments + `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)))))) -(define-public rust-derive-builder-0.12 +(define-public rust-derive-builder-0.13 (package (name "rust-derive-builder") - (version "0.12.0") + (version "0.13.1") (source (origin (method url-fetch) (uri (crate-uri "derive_builder" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1y4p569zcvpmly5s5hmjp9h83drxvdp6kj6bb61h225mhj3pfrwd")))) + "1irqx6bz74kx48ivdwqp2xl1ibr8dbdwgh6573r8g00d82gicncg")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-derive-builder-macro" ,rust-derive-builder-macro-0.12)) + (("rust-derive-builder-macro" ,rust-derive-builder-macro-0.13)) #:cargo-development-inputs (("rust-pretty-assertions" ,rust-pretty-assertions-0.6) ("rust-rustversion" ,rust-rustversion-1) @@ -18542,6 +20457,28 @@ Instead, enable the @code{derive} feature of the @code{arbitrary} crate.") for arbitrary structs.") (license (list license:expat license:asl2.0)))) +(define-public rust-derive-builder-0.12 + (package + (inherit rust-derive-builder-0.13) + (name "rust-derive-builder") + (version "0.12.0") + (source (origin + (method url-fetch) + (uri (crate-uri "derive_builder" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1y4p569zcvpmly5s5hmjp9h83drxvdp6kj6bb61h225mhj3pfrwd")))) + (arguments + `(#:cargo-inputs + (("rust-derive-builder-macro" ,rust-derive-builder-macro-0.12)) + #:cargo-development-inputs + (("rust-pretty-assertions" ,rust-pretty-assertions-0.6) + ("rust-rustversion" ,rust-rustversion-1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-trybuild" ,rust-trybuild-1)))))) + (define-public rust-derive-builder-0.11 (package (inherit rust-derive-builder-0.12) @@ -18629,32 +20566,51 @@ for arbitrary structs.") ("rust-skeptic" ,rust-skeptic-0.13) ("rust-syn" ,rust-syn-0.15)))))) -(define-public rust-derive-builder-core-0.12 +(define-public rust-derive-builder-core-0.13 (package (name "rust-derive-builder-core") - (version "0.12.0") + (version "0.13.1") (source (origin (method url-fetch) (uri (crate-uri "derive_builder_core" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "03vvmw3mfg370swq0dh2h5kcjjb8va2m4asqgp9wfyy4l08xq6y1")))) + "1381dgjq6jhirww088dff8b00v2d99illvnan0l0kvz7qdy33v54")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs - (("rust-darling" ,rust-darling-0.14) - ("rust-proc-macro2" ,rust-proc-macro2-1) - ("rust-quote" ,rust-quote-1) - ("rust-syn" ,rust-syn-1)) + `(#:cargo-inputs (("rust-darling" ,rust-darling-0.14) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)) #:cargo-development-inputs - (("rust-pretty-assertions" ,rust-pretty-assertions-0.6)))) + (("rust-pretty-assertions" ,rust-pretty-assertions-1)))) (home-page "https://github.com/colin-kiegel/rust-derive-builder") (synopsis "Internal helper library for @code{rust-derive-builder}") (description "Internal helper library for @code{rust-derive-builder}.") (license (list license:expat license:asl2.0)))) +(define-public rust-derive-builder-core-0.12 + (package + (inherit rust-derive-builder-core-0.13) + (name "rust-derive-builder-core") + (version "0.12.0") + (source (origin + (method url-fetch) + (uri (crate-uri "derive_builder_core" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "03vvmw3mfg370swq0dh2h5kcjjb8va2m4asqgp9wfyy4l08xq6y1")))) + (arguments + `(#:cargo-inputs (("rust-darling" ,rust-darling-0.14) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)) + #:cargo-development-inputs + (("rust-pretty-assertions" ,rust-pretty-assertions-0.6)))))) + (define-public rust-derive-builder-core-0.11 (package (inherit rust-derive-builder-core-0.12) @@ -18743,30 +20699,44 @@ for arbitrary structs.") ("rust-quote" ,rust-quote-0.6) ("rust-syn" ,rust-syn-0.15)))))) -(define-public rust-derive-builder-macro-0.12 +(define-public rust-derive-builder-macro-0.13 (package (name "rust-derive-builder-macro") - (version "0.12.0") + (version "0.13.1") (source (origin (method url-fetch) (uri (crate-uri "derive_builder_macro" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "17p71qzh7x1q2yxzz3xrg73zw3xl0h479b7ybyjm0s1rg9fa7kgb")))) + "09q17rzgf8bsj8n1bhlf4f93nmqg8va6321ppcd07f1mzg1nh0w7")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs - (("rust-derive-builder-core" ,rust-derive-builder-core-0.12) - ("rust-syn" ,rust-syn-1)))) + `(#:cargo-inputs (("rust-derive-builder-core" ,rust-derive-builder-core-0.13) + ("rust-syn" ,rust-syn-1)))) (home-page "https://github.com/colin-kiegel/rust-derive-builder") - (synopsis - "Rust macro to automatically implement the builder pattern for arbitrary structs") + (synopsis "Automatically implement the builder pattern for arbitrary structs") (description "This crate provides a Rust macro to automatically implement the builder pattern for arbitrary structs.") (license (list license:expat license:asl2.0)))) +(define-public rust-derive-builder-macro-0.12 + (package + (inherit rust-derive-builder-macro-0.13) + (name "rust-derive-builder-macro") + (version "0.12.0") + (source (origin + (method url-fetch) + (uri (crate-uri "derive_builder_macro" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "17p71qzh7x1q2yxzz3xrg73zw3xl0h479b7ybyjm0s1rg9fa7kgb")))) + (arguments + `(#:cargo-inputs (("rust-derive-builder-core" ,rust-derive-builder-core-0.12) + ("rust-syn" ,rust-syn-1)))))) + (define-public rust-derive-builder-macro-0.11 (package (inherit rust-derive-builder-macro-0.12) @@ -18903,8 +20873,31 @@ traits for both structs and enums.") ("rust-rustc-version" ,rust-rustc-version-0.2) ("rust-syn" ,rust-syn-0.15)))))) +(define-public rust-derive-new-0.6 + (package + (name "rust-derive-new") + (version "0.6.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "derive-new" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1b8jv6jx0b8jgkz9kmz0ciqmnf74xkk0mmvkb5z1c87932kdwl6i")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-2)))) + (home-page "https://github.com/nrc/derive-new") + (synopsis "Simple constructor functions for structs and enums") + (description "`#[derive(new)]` implements simple constructor functions for +structs and enums.") + (license license:expat))) + (define-public rust-derive-new-0.5 (package + (inherit rust-derive-new-0.6) (name "rust-derive-new") (version "0.5.9") (source @@ -18914,17 +20907,39 @@ traits for both structs and enums.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "0d9m5kcj1rdmdjqfgj7rxxhdzx0as7p4rp1mjx5j6w5dl2f3461l")))) + (arguments + `(#:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)))))) + +(define-public rust-derive-utils-0.11 + (package + (name "rust-derive-utils") + (version "0.11.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "derive_utils" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1gx7giwn8x427d5f8c92n9h0hhcqdsasvz7i8iq2rqffvhalqask")))) (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/nrc/derive-new") - (synopsis "Simple constructor functions for structs and enums") - (description "`#[derive(new)]` implements simple constructor functions for -structs and enums.") - (license license:expat))) + ("rust-syn" ,rust-syn-1)) + #:cargo-development-inputs + (("rust-rustversion" ,rust-rustversion-1) + ("rust-trybuild" ,rust-trybuild-1)))) + (home-page "https://github.com/taiki-e/derive_utils") + (synopsis "Macro helper for easily writing derives macros for enum") + (description + "This crate provides a procedural macro helper for easily +writing derives macros for enums.") + (license (list license:expat license:asl2.0)))) (define-public rust-derive-where-1 (package @@ -18954,6 +20969,45 @@ structs and enums.") (description "Deriving with custom trait bounds.") (license (list license:expat license:asl2.0)))) +(define-public rust-deser-hjson-1 + (package + (name "rust-deser-hjson") + (version "1.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "deser-hjson" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1bacgp2zhyxj6m7hh00sl65b8bripw5nb80jwcniplglzscspq9h")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t ; Cut the dependency chain. + #:cargo-inputs (("rust-serde" ,rust-serde-1)))) + (home-page "https://github.com/Canop/deser-hjson") + (synopsis "Hjson deserializer for Serde") + (description "This package provides an Hjson deserializer for Serde.") + (license license:expat))) + +(define-public rust-detone-1 + (package + (name "rust-detone") + (version "1.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "detone" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "052mnp8qjp71ypcv0ixvlw7isn1yv79qn05jrcfi9j2r70clq47p")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-development-inputs (("rust-unic-normal" ,rust-unic-normal-0.9)))) + (home-page "https://docs.rs/detone/") + (synopsis "Decompose Vietnamese tone marks") + (description "Decompose Vietnamese tone marks.") + (license (list license:expat license:asl2.0)))) + (define-public rust-deunicode-0.4 (package (name "rust-deunicode") @@ -18996,6 +21050,22 @@ intelligently transliterating them. It supports Emoji and Chinese.") procedural macros.") (license (list license:expat license:asl2.0)))) +(define-public rust-devise-0.3 + (package + (inherit rust-devise-0.4) + (name "rust-devise") + (version "0.3.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "devise" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "15dmibnykic2a1ndi66shyvxmpfysnhf05lg2iv8871g0w5miish")))) + (arguments + `(#:cargo-inputs (("rust-devise-codegen" ,rust-devise-codegen-0.3) + ("rust-devise-core" ,rust-devise-core-0.3)))))) + (define-public rust-devise-0.2 (package (inherit rust-devise-0.4) @@ -19009,10 +21079,13 @@ procedural macros.") (sha256 (base32 "09p52f54givb0g9l7clj11z755vldk8758y2lwm5mp3sa156qwfx")))) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-devise-codegen" ,rust-devise-codegen-0.2) - ("rust-devise-core" ,rust-devise-core-0.2)))))) + `(#:cargo-inputs (("rust-devise-codegen" ,rust-devise-codegen-0.2) + ("rust-devise-core" ,rust-devise-core-0.2)) + #:phases (modify-phases %standard-phases + ;; Enable using nightly/dev features + (add-after 'unpack 'enable-unstable-features + (lambda _ + (setenv "RUSTC_BOOTSTRAP" "1")))))))) (define-public rust-devise-codegen-0.4 (package @@ -19036,6 +21109,21 @@ procedural macros.") procedural macros.") (license (list license:expat license:asl2.0)))) +(define-public rust-devise-codegen-0.3 + (package + (inherit rust-devise-codegen-0.4) + (name "rust-devise-codegen") + (version "0.3.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "devise_codegen" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1cp7nnfwvjp6wfq11n0ffjjrwfa1wbsb58g1bz3ha6z5lvkp6g0j")))) + (arguments + `(#:cargo-inputs (("rust-devise-core" ,rust-devise-core-0.3) + ("rust-quote" ,rust-quote-1)))))) (define-public rust-devise-codegen-0.2 (package @@ -19050,10 +21138,13 @@ procedural macros.") (sha256 (base32 "0lxbixni2v6snx2mkgi0kyq5dv8v6c5s57b6wc47q4hqs6884yza")))) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-devise-core" ,rust-devise-core-0.2) - ("rust-quote" ,rust-quote-0.6)))))) + `(#:cargo-inputs (("rust-devise-core" ,rust-devise-core-0.2) + ("rust-quote" ,rust-quote-0.6)) + #:phases (modify-phases %standard-phases + ;; Enable using nightly/dev features + (add-after 'unpack 'enable-unstable-features + (lambda _ + (setenv "RUSTC_BOOTSTRAP" "1")))))))) (define-public rust-devise-core-0.4 (package @@ -19081,6 +21172,26 @@ procedural macros.") procedural macros.") (license (list license:expat license:asl2.0)))) +(define-public rust-devise-core-0.3 + (package + (inherit rust-devise-core-0.4) + (name "rust-devise-core") + (version "0.3.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "devise_core" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1l00qiih4z14ai0c3s16nlvw0kv4p07ygi6a0ms0knc78xpz87l4")))) + (arguments + `(#:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-proc-macro2-diagnostics" ,rust-proc-macro2-diagnostics-0.9) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)))))) + (define-public rust-devise-core-0.2 (package (inherit rust-devise-core-0.4) @@ -19094,12 +21205,15 @@ procedural macros.") (sha256 (base32 "0wr3jdzzibpafz73hcca83wnzdgjinvm7axmxnyfkbasbnfkw1fi")))) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-bitflags" ,rust-bitflags-1) - ("rust-proc-macro2" ,rust-proc-macro2-0.4) - ("rust-quote" ,rust-quote-0.6) - ("rust-syn" ,rust-syn-0.15)))))) + `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) + ("rust-proc-macro2" ,rust-proc-macro2-0.4) + ("rust-quote" ,rust-quote-0.6) + ("rust-syn" ,rust-syn-0.15)) + #:phases (modify-phases %standard-phases + ;; Enable using nightly/dev features + (add-after 'unpack 'enable-unstable-features + (lambda _ + (setenv "RUSTC_BOOTSTRAP" "1")))))))) (define-public rust-dhcproto-0.9 (package @@ -19114,7 +21228,9 @@ procedural macros.") (base32 "1hsbl77lxvxa94ihn2vna1sx2icrkch427w24a883xymhm9h9vnw")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs (("rust-dhcproto-macros" ,rust-dhcproto-macros-0.1) + `(#:cargo-test-flags '("--release" "--" + "--skip=v6::options::tests::test_range_binsearch") + #:cargo-inputs (("rust-dhcproto-macros" ,rust-dhcproto-macros-0.1) ("rust-hex" ,rust-hex-0.4) ("rust-ipnet" ,rust-ipnet-2) ("rust-rand" ,rust-rand-0.8) @@ -19222,26 +21338,78 @@ example.") ("rust-tempfile" ,rust-tempfile-3) ("rust-zeroize" ,rust-zeroize-1)))))) +(define-public rust-diesel-2 + (package + (name "rust-diesel") + (version "2.1.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "diesel" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0ndmiv98xq2glkr4bqfq58fc3qncscfzx63xpj4ipwlqf30hbz03")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-test-flags + '("--release" + "--features" "sqlite") + #:cargo-inputs (("rust-bigdecimal" ,rust-bigdecimal-0.1) + ("rust-bitflags" ,rust-bitflags-2) + ("rust-byteorder" ,rust-byteorder-1) + ("rust-chrono" ,rust-chrono-0.4) + ("rust-diesel-derives" ,rust-diesel-derives-2) + ("rust-ipnet" ,rust-ipnet-2) + ("rust-ipnetwork" ,rust-ipnetwork-0.17) + ("rust-itoa" ,rust-itoa-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-libsqlite3-sys" ,rust-libsqlite3-sys-0.20) + ("rust-mysqlclient-sys" ,rust-mysqlclient-sys-0.2) + ("rust-num-bigint" ,rust-num-bigint-0.2) + ("rust-num-integer" ,rust-num-integer-0.1) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-percent-encoding" ,rust-percent-encoding-2) + ("rust-pq-sys" ,rust-pq-sys-0.4) + ("rust-quickcheck" ,rust-quickcheck-1) + ("rust-r2d2" ,rust-r2d2-0.8) + ("rust-serde-json" ,rust-serde-json-0.9) + ("rust-time" ,rust-time-0.3) + ("rust-url" ,rust-url-2) + ("rust-uuid" ,rust-uuid-0.7)) + #:cargo-development-inputs (("rust-cfg-if" ,rust-cfg-if-1) + ("rust-dotenvy" ,rust-dotenvy-0.15) + ("rust-ipnetwork" ,rust-ipnetwork-0.17) + ("rust-quickcheck" ,rust-quickcheck-1)))) + (native-inputs (list sqlite)) + (home-page "https://diesel.rs") + (synopsis "Safe, extensible ORM and Query Builder") + (description "This package provides a safe, extensible ORM and Query +Builder for PostgreSQL, SQLite, and MySQL.") + (license (list license:expat license:asl2.0)))) + (define-public rust-diesel-1 (package + (inherit rust-diesel-2) (name "rust-diesel") - (version "1.4.6") + (version "1.4.8") (source (origin (method url-fetch) (uri (crate-uri "diesel" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0hpmwrc0zx3zvpgwp9zrm6wj8d8i8q8990grlrnfzlivbi6zqyq4")))) - (build-system cargo-build-system) + "0kcfkfhsv5yv3ksj440ajgic930359i2bqi77ss4dm5pyvn3b0dj")))) (arguments `(#:cargo-test-flags '("--release" "--features" "sqlite" "--" - "--skip=expression::count::count") + "--skip=expression::count::count" + "--skip=macros::internal::parse_type_args_with_bounds" + "--skip=macros::internal::parse_type_args_with_bounds_containing_braces_and_commas" + "--skip=macros::internal::parse_type_args_with_existentials_and_lifetimes" + "--skip=macros::internal::parse_type_args_with_trailer") #:cargo-inputs (("rust-bigdecimal" ,rust-bigdecimal-0.1) ("rust-bitflags" ,rust-bitflags-1) @@ -19267,16 +21435,45 @@ example.") (("rust-cfg-if" ,rust-cfg-if-0.1) ("rust-dotenv" ,rust-dotenv-0.10) ("rust-quickcheck" ,rust-quickcheck-0.4) - ("rust-tempdir" ,rust-tempdir-0.3)))) + ("rust-tempdir" ,rust-tempdir-0.3)))))) + +(define-public rust-diesel-derives-2 + (package + (name "rust-diesel-derives") + (version "2.1.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "diesel_derives" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "036f3i1hsl2m2c0basg28adc9rh3vnr2vp0xwvzi9rsah75yw0jx")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-test-flags + '("--release" "--" + "--skip=derive_insertable" + "--skip=derive_multiconnection" + "--skip=derive_queryable" + "--skip=derive_queryable_by_name") + #:cargo-inputs + (("rust-diesel-table-macro-syntax" ,rust-diesel-table-macro-syntax-0.1) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-2)) + #:cargo-development-inputs (("rust-cfg-if" ,rust-cfg-if-1) + ("rust-diesel" ,rust-diesel-2) + ("rust-dotenvy" ,rust-dotenvy-0.15)))) (native-inputs (list sqlite)) (home-page "https://diesel.rs") - (synopsis "Safe, extensible ORM and Query Builder") - (description "This package provides a safe, extensible ORM and Query -Builder for PostgreSQL, SQLite, and MySQL.") + (synopsis "Crate internal to Diesel") + (description "You should not use this crate directly, it is internal to +Diesel.") (license (list license:expat license:asl2.0)))) (define-public rust-diesel-derives-1 (package + (inherit rust-diesel-derives-2) (name "rust-diesel-derives") (version "1.4.1") (source @@ -19287,7 +21484,6 @@ Builder for PostgreSQL, SQLite, and MySQL.") (sha256 (base32 "1lsq133fwk0zj8xvxhdxqgg0xs31zf3abnwdyshaf0ldca7hkxa5")))) - (build-system cargo-build-system) (arguments `(#:tests? #f ; cannot find type `SqliteConnection` in this scope #:cargo-test-flags @@ -19302,13 +21498,7 @@ Builder for PostgreSQL, SQLite, and MySQL.") #:cargo-development-inputs (("rust-cfg-if" ,rust-cfg-if-0.1) ("rust-diesel" ,rust-diesel-1) - ("rust-dotenv" ,rust-dotenv-0.10)))) - (native-inputs (list sqlite)) - (home-page "https://diesel.rs") - (synopsis "Crate internal to Diesel") - (description "You should not use this crate directly, it is internal to -Diesel.") - (license (list license:expat license:asl2.0)))) + ("rust-dotenv" ,rust-dotenv-0.10)))))) (define-public rust-diesel-migrations-1 (package @@ -19339,6 +21529,25 @@ Diesel.") (description "This package provides migration management for Diesel.") (license (list license:expat license:asl2.0)))) +(define-public rust-diesel-table-macro-syntax-0.1 + (package + (name "rust-diesel-table-macro-syntax") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "diesel_table_macro_syntax" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1i9115qgsnargr6a707lqcjc45wqzq351a2gbvnnyw2kqkpmfmgw")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-syn" ,rust-syn-2)))) + (home-page "https://diesel.rs") + (synopsis "Internal diesel crate") + (description "Internal diesel crate.") + (license (list license:expat license:asl2.0)))) + (define-public rust-diff-0.1 (package (name "rust-diff") @@ -19428,23 +21637,6 @@ Diesel.") "This crate provides all necessary tools for comparing word sequences.") (license license:expat))) -(define-public rust-diffr-lib-0.1 - (package - (name "rust-diffr-lib") - (version "0.1.3") - (source - (origin - (method url-fetch) - (uri (crate-uri "diffr-lib" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 "0id3hpblvvcw4ydcd1cc7wgcwqjbh3grlihrmd8zp7k0d2h47i3g")))) - (build-system cargo-build-system) - (home-page "https://github.com/mookid/diffr") - (synopsis "Implementation of Myers diff algorithm") - (description "An implementation of Myers diff algorithm.") - (license license:expat))) - (define-public rust-diffs-0.3 (package (name "rust-diffs") @@ -19467,6 +21659,28 @@ common subsequence. The diff algorithms include Myer's diff and Patience diff.") (license (list license:asl2.0 license:expat)))) +(define-public rust-dircpy-0.3 + (package + (name "rust-dircpy") + (version "0.3.16") + (source + (origin + (method url-fetch) + (uri (crate-uri "dircpy" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1jkj888b22ln6qcvjlrl6a2za1y5j1c8f021qjzq0jf3a6vrs999")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t ; Cut the dependency chain. + #:cargo-inputs (("rust-jwalk" ,rust-jwalk-0.8) + ("rust-log" ,rust-log-0.4) + ("rust-walkdir" ,rust-walkdir-2)))) + (home-page "https://github.com/woelper/dircpy/") + (synopsis "Copy directories recursively with flexible options") + (description "Copy directories recursively with flexible options.") + (license license:expat))) + (define-public rust-directories-5 (package (name "rust-directories") @@ -19744,20 +21958,19 @@ and @code{directories} crates.") (package (inherit rust-dirs-sys-0.3) (name "rust-dirs-sys-next") - (version "0.1.1") + (version "0.1.2") (source (origin (method url-fetch) (uri (crate-uri "dirs-sys-next" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0zgy7is3h2dyf1l4sa7k065w2kvx0l12l40my4rswm2mc1gkdplr")))) + "0kavhavdxv4phzj4l0psvh55hszwnr0rcz8sxbvx20pyqi2a3gaf")))) (arguments `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2) - ("rust-redox-users" ,rust-redox-users-0.3) + ("rust-redox-users" ,rust-redox-users-0.4) ("rust-winapi" ,rust-winapi-0.3)))) (home-page "https://github.com/xdg-rs/dirs/tree/master/dirs-sys"))) @@ -19835,6 +22048,54 @@ via a doc comment and string interpolation.") Google's diff-match-patch.") (license (list license:expat license:asl2.0)))) +(define-public rust-divan-0.1 + (package + (name "rust-divan") + (version "0.1.14") + (source + (origin + (method url-fetch) + (uri (crate-uri "divan" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0v757vmvlksbaqz7q8cgq7hvr3dimrddcarz7yj70a4w5kgngmd0")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-1) + ("rust-clap" ,rust-clap-4) + ("rust-condtype" ,rust-condtype-1) + ("rust-divan-macros" ,rust-divan-macros-0.1) + ("rust-libc" ,rust-libc-0.2) + ("rust-regex-lite" ,rust-regex-lite-0.1)) + #:cargo-development-inputs (("rust-mimalloc" ,rust-mimalloc-0.1)))) + (inputs (list mimalloc)) + (home-page "https://github.com/nvzqz/divan") + (synopsis "Statistically-comfy benchmarking library") + (description "Statistically-comfy benchmarking library.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-divan-macros-0.1 + (package + (name "rust-divan-macros") + (version "0.1.14") + (source + (origin + (method url-fetch) + (uri (crate-uri "divan-macros" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "18klwl81akqmd0rqgz6l8hmc649hvbcdfc01ix6lh3dy96phnm17")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-2)))) + (home-page "https://github.com/nvzqz/divan") + (synopsis "Macros for Divan, a statistically-comfy benchmarking library") + (description "This package provides macros for Divan, a statistically-comfy +benchmarking library.") + (license (list license:expat license:asl2.0)))) + (define-public rust-dlib-0.5 (package (name "rust-dlib") @@ -19915,6 +22176,35 @@ a vector.") #:cargo-inputs (("rust-rand" ,rust-rand-0.8)))))) +(define-public rust-dns-lookup-2 + (package + (name "rust-dns-lookup") + (version "2.0.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "dns-lookup" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1z74n2zij2gahycabm0gkmkyx574h76gwk7sz93yqpr3qa3n0xp5")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-test-flags '("--release" "--" + ;; Tries to access the network + "--skip=nameinfo::test_getnameinfo" + "--skip=src/lib.rs - (line 36)") + #:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-socket2" ,rust-socket2-0.5) + ("rust-windows-sys" ,rust-windows-sys-0.48)))) + (home-page "https://github.com/keeperofdakeys/dns-lookup/") + (synopsis "DNS resolution interface") + (description + "This package provides a simple DNS resolving interface, much like Rust's +unstable API. It includes @code{getaddrinfo} and @code{getnameinfo} wrappers +for libc variants.") + (license (list license:expat license:asl2.0)))) + (define-public rust-dns-parser-0.8 (package (name "rust-dns-parser") @@ -19942,36 +22232,6 @@ a vector.") not support network, only raw protocol parser.") (license (list license:expat license:asl2.0)))) -(define-public rust-dns-lookup-2 - (package - (name "rust-dns-lookup") - (version "2.0.4") - (source - (origin - (method url-fetch) - (uri (crate-uri "dns-lookup" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 "1z74n2zij2gahycabm0gkmkyx574h76gwk7sz93yqpr3qa3n0xp5")))) - (build-system cargo-build-system) - (arguments - `(#:cargo-test-flags - '("--" - ;; the builder sandbox breaks getaddrinfo, failing two tests. - "--skip=nameinfo::test_getnameinfo" - "--skip=src/lib.rs") - #:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-1) - ("rust-libc" ,rust-libc-0.2) - ("rust-socket2" ,rust-socket2-0.5) - ("rust-windows-sys" ,rust-windows-sys-0.48)))) - (home-page "https://github.com/keeperofdakeys/dns-lookup/") - (synopsis "DNS resolution interface") - (description - "This package provides a simple DNS resolving interface, much like Rust's -unstable API. It includes @code{getaddrinfo} and @code{getnameinfo} wrappers -for libc variants.") - (license (list license:expat license:asl2.0)))) - (define-public rust-dns-sd-0.1 (package (name "rust-dns-sd") @@ -20371,26 +22631,24 @@ floating-point primitives to an @code{io::Write}.") "Serialize float number and truncate to certain precision in Rust.") (license license:mpl2.0))) -(define-public rust-dtparse-1 +(define-public rust-dtparse-2 (package (name "rust-dtparse") - (version "1.3.0") + (version "2.0.0") (source (origin (method url-fetch) (uri (crate-uri "dtparse" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1awhyy58c28fhr5nvvfpikdzraihichkz3w1mzdg7smyffldi4w2")))) + (base32 "0fg8h07m0z38c6i556dfmgnhl18i8w37cl235iyfzc9l3kz7r325")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs - (("rust-chrono" ,rust-chrono-0.4) - ("rust-lazy-static" ,rust-lazy-static-1) - ("rust-num-traits" ,rust-num-traits-0.2) - ("rust-rust-decimal" ,rust-rust-decimal-1)) - #:cargo-development-inputs - (("rust-base64" ,rust-base64-0.13)))) + `(#:cargo-inputs (("rust-chrono" ,rust-chrono-0.4) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-rust-decimal" ,rust-rust-decimal-1)) + #:cargo-development-inputs (("rust-base64" ,rust-base64-0.21)))) (home-page "https://github.com/bspeice/dtparse.git") (synopsis "Dateutil-compatible timestamp parser for Rust") (description @@ -20398,6 +22656,25 @@ floating-point primitives to an @code{io::Write}.") Rust.") (license license:asl2.0))) +(define-public rust-dtparse-1 + (package + (inherit rust-dtparse-2) + (name "rust-dtparse") + (version "1.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "dtparse" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1awhyy58c28fhr5nvvfpikdzraihichkz3w1mzdg7smyffldi4w2")))) + (arguments + `(#:cargo-inputs (("rust-chrono" ,rust-chrono-0.4) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-rust-decimal" ,rust-rust-decimal-1)) + #:cargo-development-inputs (("rust-base64" ,rust-base64-0.13)))))) + (define-public rust-duct-0.13 (package (name "rust-duct") @@ -20432,20 +22709,21 @@ Rust.") (define-public rust-dyn-clone-1 (package (name "rust-dyn-clone") - (version "1.0.4") + (version "1.0.17") (source (origin (method url-fetch) (uri (crate-uri "dyn-clone" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1kxb16nxiixn558gn82yaq2fl6271jay4rqkrw31lmnprjpjc9pf")))) + (base32 "09cig7dgg6jnqa10p4233nd8wllbjf4ffsw7wj0m4lwa5w3z0vhd")))) (arguments - `(#:skip-build? #t)) + `(#:cargo-development-inputs (("rust-rustversion" ,rust-rustversion-1) + ("rust-trybuild" ,rust-trybuild-1)))) (build-system cargo-build-system) (home-page "https://crates.io/crates/dyn-clone") (synopsis "Clone trait that is object-safe") - (description "Clone trait that is object-safe") + (description "This package provides a clone trait that is object-safe.") (license (list license:expat license:asl2.0)))) (define-public rust-dwrote-0.11 @@ -20475,20 +22753,20 @@ Rust.") "This package provides lightweight binding to DirectWrite.") (license license:mpl2.0))) -(define-public rust-easy-cast-0.4 +(define-public rust-easy-cast-0.5 (package (name "rust-easy-cast") - (version "0.4.4") + (version "0.5.2") (source (origin (method url-fetch) (uri (crate-uri "easy-cast" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "13ilmaplp2s4vw1vjh4pwbzk7jdxrn0kpf0rk5sli0s1ikp05lab")))) + (base32 "1mizff08p0rlmgvi81rqdblji372rhr17xlvzmqylfsz2iw6g4qh")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t + `(#:cargo-test-flags '("--") ; fails in --release mode #:cargo-inputs (("rust-libm" ,rust-libm-0.2)))) (home-page "https://github.com/kas-gui/easy-cast") (synopsis "Type conversions which are expected to succeed") @@ -20496,6 +22774,22 @@ Rust.") easy.") (license license:asl2.0))) +(define-public rust-easy-cast-0.4 + (package + (inherit rust-easy-cast-0.5) + (name "rust-easy-cast") + (version "0.4.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "easy-cast" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "13ilmaplp2s4vw1vjh4pwbzk7jdxrn0kpf0rk5sli0s1ikp05lab")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs (("rust-libm" ,rust-libm-0.2)))))) + (define-public rust-easy-parallel-3 (package (name "rust-easy-parallel") @@ -20882,33 +23176,42 @@ Emacs' support for dynamic modules.") "This crate provides an implementation of RFC 5322 email messages.") (license license:expat))) -(define-public rust-lettre-email-0.9 +(define-public rust-embedded-io-0.6 (package - (name "rust-lettre-email") - (version "0.9.4") + (name "rust-embedded-io") + (version "0.6.1") (source (origin (method url-fetch) - (uri (crate-uri "lettre_email" version)) + (uri (crate-uri "embedded-io" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1mar4njchjd33q7s47r43njjj8farkb78f8ica77jj6gil7lh0px")))) + (base32 "0v901xykajh3zffn6x4cnn4fhgfw3c8qpjwbsk6gai3gaccg3l7d")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-base64" ,rust-base64-0.10) - ("rust-email" ,rust-email-0.0.20) - ("rust-lettre" ,rust-lettre-0.9) - ("rust-mime" ,rust-mime-0.3) - ("rust-time" ,rust-time-0.1) - ("rust-uuid" ,rust-uuid-0.7)))) - (home-page "https://github.com/lettre/lettre") - (synopsis "Mailer library for Rust") - (description "Lettre is a mailer library for Rust. It provides multiple -transport methods, unicode support, secure delivery with SMTP using encryption -and authentication, easy email builders, and async support.") - (license license:expat))) + `(#:cargo-inputs (("rust-defmt" ,rust-defmt-0.3)))) + (home-page "https://github.com/rust-embedded/embedded-hal") + (synopsis "Embedded IO traits") + (description "This package provides embedded IO traits.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-embedded-io-0.4 + (package + (inherit rust-embedded-io-0.6) + (name "rust-embedded-io") + (version "0.4.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "embedded-io" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1v9wrc5nsgaaady7i3ya394sik5251j0iq5rls7mrx7fv696h6pg")))) + (arguments + `(#:cargo-inputs (("rust-defmt" ,rust-defmt-0.3) + ("rust-futures" ,rust-futures-0.3) + ("rust-log" ,rust-log-0.4) + ("rust-tokio" ,rust-tokio-1)))))) (define-public rust-emojis-0.5 (package @@ -21812,14 +24115,14 @@ is configured via an environment variable.") (package (inherit rust-env-logger-0.11) (name "rust-env-logger") - (version "0.10.1") + (version "0.10.2") (source (origin (method url-fetch) (uri (crate-uri "env_logger" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1kmy9xmfjaqfvd4wkxr1f7d16ld3h9b487vqs2q9r0s8f3kg7cwm")))) + (base32 "1005v71kay9kbz1d5907l0y7vh9qn2fqsp2yfgb8bjvin6m0bm2c")))) (arguments `(#:cargo-inputs (("rust-humantime" ,rust-humantime-2) @@ -22237,8 +24540,28 @@ deserialized from environment variables.") `(#:cargo-inputs (("rust-backtrace" ,rust-backtrace-0.3)))))) +(define-public rust-error-code-3 + (package + (name "rust-error-code") + (version "3.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "error-code" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0nqpbhi501z3ydaxg4kjyb68xcw025cj22prwabiky0xsljl8ix0")))) + (build-system cargo-build-system) + (home-page "https://github.com/DoumanAsh/error-code") + (synopsis "Alternative @code{Error} for Rust") + (description + "This package provides a simplified @code{Error} which works in +@code{no_std} environment.") + (license license:boost1.0))) + (define-public rust-error-code-2 (package + (inherit rust-error-code-3) (name "rust-error-code") (version "2.3.0") (source @@ -22248,18 +24571,30 @@ deserialized from environment variables.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "1zxi3pfrmj7hmv2bv94ax8vpylsfs49vwwp48c04wrr5mikma4dm")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-libc" ,rust-libc-0.2) - ("rust-str-buf" ,rust-str-buf-1)))) - (home-page "") - (synopsis "Alternative @code{Error} for Rust") - (description - "This package provides a simplified @code{Error} which works in -@code{no_std} environment.") - (license license:boost1.0))) + ("rust-str-buf" ,rust-str-buf-1)))))) + +(define-public rust-escape8259-0.5 + (package + (name "rust-escape8259") + (version "0.5.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "escape8259" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1vjpfnk9fyq6qcc18bq7yfk9ahi2r12lfywr4rwcsvv6wc8ljkxs")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-rustversion" ,rust-rustversion-1)))) + (home-page "https://github.com/ericseppanen/escape8259") + (synopsis "RFC8259-compliant string escaping and un-escaping") + (description "RFC8259-compliant string escaping and un-escaping.") + (license license:expat))) (define-public rust-escaper-0.1 (package @@ -22358,6 +24693,75 @@ libraries generally do not give you a choice in terms of which standards/convent they follow. Etcetera, on the other hand, gives you the choice.") (license (list license:expat license:asl2.0)))) +(define-public rust-ethnum-1 + (package + (name "rust-ethnum") + (version "1.5.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "ethnum" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0b68ngvisb0d40vc6h30zlhghbb3mc8wlxjbf8gnmavk1dca435r")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-ethnum-intrinsics" ,rust-ethnum-intrinsics-1) + ("rust-serde" ,rust-serde-1)))) + (home-page "https://github.com/nlordell/ethnum-rs") + (synopsis "256-bit integer implementation") + (description "This package contains a 256-bit integer implementation.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-ethnum-intrinsics-1 + (package + (name "rust-ethnum-intrinsics") + (version "1.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "ethnum-intrinsics" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1qvb1r3vmnk5nplz6x1014rn6b9nfnig2qmlj8hi3jpq75j8cgh9")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t ; error: unterminated attribute group + #:cargo-inputs (("rust-cc" ,rust-cc-1)))) + (inputs (list clang)) + (home-page "https://github.com/nlordell/ethnum-rs") + (synopsis "LLVM generated 256-bit integer intrinsics") + (description + "This package contains LLVM generated 256-bit integer intrinsics.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-eui48-1 + (package + (name "rust-eui48") + (version "1.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "eui48" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "00cpf25kc3mxhqnahm0bw9xl19gr2pzc5g84dvkc4mwdbsn1hx48")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-regex" ,rust-regex-1) + ("rust-rustc-serialize" ,rust-rustc-serialize-0.3) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1)) + #:cargo-development-inputs (("rust-bincode" ,rust-bincode-1)))) + (home-page "https://github.com/abaumhauer/eui48") + (synopsis "Library to generate and parse IEEE EUI-48 and EUI-64") + (description + "This package provides a library to generate and parse IEEE EUI-48 +and EUI-64, also known as MAC-48 media access control addresses. The +IEEE claims trademarks on the names EUI-48 and EUI-64, in which EUI is an +abbreviation for Extended Unique Identifier.") + (license (list license:expat license:asl2.0)))) + (define-public rust-evdev-0.12 (package (name "rust-evdev") @@ -22390,6 +24794,70 @@ they follow. Etcetera, on the other hand, gives you the choice.") (description "This package provides evdev interface for Linux.") (license (list license:asl2.0 license:expat)))) +(define-public rust-evdev-rs-0.6 + (package + (name "rust-evdev-rs") + (version "0.6.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "evdev-rs" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1fkdw23kjjn8an3xjpi2g74yhdfkv89ngsrkjd2cxz5n1xwxa4lq")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-test-flags + '("--release" "--" + "--skip=context_change_file" + "--skip=context_create_with_file" + "--skip=context_create_with_path" + "--skip=context_grab" + "--skip=context_set_file" + "--skip=device_get_absinfo" + "--skip=device_get_value" + "--skip=device_has_property" + "--skip=device_has_syn") + #:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) + ("rust-evdev-sys" ,rust-evdev-sys-0.2) + ("rust-libc" ,rust-libc-0.2) + ("rust-log" ,rust-log-0.4) + ("rust-serde" ,rust-serde-1)))) + (native-inputs (list pkg-config)) + (inputs (list libevdev)) + (home-page "https://github.com/ndesh26/evdev-rs") + (synopsis "Bindings to libevdev") + (description + "This package provides bindings to libevdev for interacting with evdev +devices. It moves the common tasks when dealing with evdev devices into +a library and provides a library interface to the callers, thus avoiding +erroneous ioctls, etc.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-evdev-sys-0.2 + (package + (name "rust-evdev-sys") + (version "0.2.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "evdev-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0vgax74wjsm22nrx6ikh8m7bj3nggf83s961i5qd85bvahmx9shl")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs (("rust-cc" ,rust-cc-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-pkg-config" ,rust-pkg-config-0.3)))) + (home-page "https://github.com/ndesh26/evdev-rs") + (synopsis "Raw bindings to libevdev") + (description + "This package provides Raw bindings to libevdev. High level Rust +bindings are available in the @code{evdev} crate.") + (license (list license:expat license:asl2.0)))) + (define-public rust-event-listener-4 (package (name "rust-event-listener") @@ -22504,6 +24972,48 @@ blocking data structures.") ("rust-pin-project-lite" ,rust-pin-project-lite-0.2)) #:cargo-development-inputs (("rust-futures-lite" ,rust-futures-lite-1)))))) +(define-public rust-exacl-0.11 + (package + (name "rust-exacl") + (version "0.11.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "exacl" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "17vd67mhppnw1kbb053c4bygilbdviz53zrzm4z1cxr73hn1b5f6")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-test-flags + '("--release" "--" + "--skip=acl::acl_tests::test_write_acl_posix" + "--skip=acl::acl_tests::test_write_default_acl" + "--skip=qualifier::qualifier_tests::test_group_named" + "--skip=qualifier::qualifier_tests::test_user_named" + "--skip=unix::unix_tests::test_gid_to_name" + "--skip=unix::unix_tests::test_name_to_gid" + "--skip=unix::unix_tests::test_name_to_uid" + "--skip=unix::unix_tests::test_uid_to_name") + #:cargo-inputs (("rust-bindgen" ,rust-bindgen-0.68) + ("rust-bitflags" ,rust-bitflags-2) + ("rust-log" ,rust-log-0.4) + ("rust-scopeguard" ,rust-scopeguard-1) + ("rust-serde" ,rust-serde-1) + ("rust-uuid" ,rust-uuid-1)) + #:cargo-development-inputs (("rust-clap" ,rust-clap-4) + ("rust-ctor" ,rust-ctor-0.2) + ("rust-env-logger" ,rust-env-logger-0.10) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-tempfile" ,rust-tempfile-3)))) + (inputs (list acl)) + (home-page "https://github.com/byllyfish/exacl") + (synopsis "Manipulate file system (ACL) on macOS, Linux, and FreeBSD") + (description + "This package provides functions to manipulate file system access control +lists (ACL) on @code{macOS}, Linux, and @code{FreeBSD}.") + (license license:expat))) + (define-public rust-executable-path-1 (package (name "rust-executable-path") @@ -22555,6 +25065,23 @@ blocking data structures.") "This package provides a collection of high-performance task executors.") (license license:expat))) +(define-public rust-exhaustigen-0.1 + (package + (name "rust-exhaustigen") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "exhaustigen" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1djym5wjcib78fxspkkal0vdq8dd1vlllk6f6858m5haf53zg23x")))) + (build-system cargo-build-system) + (home-page "https://github.com/graydon/exhaustigen-rs") + (synopsis "Exhaustive test generator") + (description "This package provides an exhaustive test generator.") + (license (list license:expat license:asl2.0)))) + (define-public rust-exitcode-1 (package (name "rust-exitcode") @@ -22635,14 +25162,14 @@ by @file{sysexits.h}.") (define-public rust-expect-test-1 (package (name "rust-expect-test") - (version "1.4.1") + (version "1.5.0") (source (origin (method url-fetch) (uri (crate-uri "expect-test" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1lzqx5hqh1g4llzqby4z1d18xmrjjx63c5l0na7ycf6mmpzfmn9h")))) + (base32 "1q55nrkgzg345905aqbsdrwlq4sk0gjn4z5bdph1an1kc6jy02wy")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -22712,6 +25239,89 @@ testing.") like Don libes expect.") (license license:expat))) +(define-public rust-eyeball-0.8 + (package + (name "rust-eyeball") + (version "0.8.7") + (source + (origin + (method url-fetch) + (uri (crate-uri "eyeball" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1yw01cm6316xrq26nz3nhlvnsfahc96j692brrai04c2v69jhj22")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-criterion" ,rust-criterion-0.5) + ("rust-futures-core" ,rust-futures-core-0.3) + ("rust-readlock" ,rust-readlock-0.1) + ("rust-readlock-tokio" ,rust-readlock-tokio-0.1) + ("rust-tokio" ,rust-tokio-1) + ("rust-tokio-util" ,rust-tokio-util-0.7) + ("rust-tracing" ,rust-tracing-0.1)) + #:cargo-development-inputs + (("rust-futures-util" ,rust-futures-util-0.3) + ("rust-stream-assert" ,rust-stream-assert-0.1) + ("rust-tokio" ,rust-tokio-1)))) + (home-page "https://github.com/jplatte/eyeball") + (synopsis "Add observability to your Rust types") + (description "Add observability to your Rust types!") + (license license:mpl2.0))) + +(define-public rust-eyeball-im-0.4 + (package + (name "rust-eyeball-im") + (version "0.4.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "eyeball-im" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0pb2dmqji80hj1c7skk5pg0w64lsqaanmm8ngf3fa2v7v4lsn7q2")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-futures-core" ,rust-futures-core-0.3) + ("rust-imbl" ,rust-imbl-2) + ("rust-tokio" ,rust-tokio-1) + ("rust-tokio-util" ,rust-tokio-util-0.7) + ("rust-tracing" ,rust-tracing-0.1)) + #:cargo-development-inputs + (("rust-stream-assert" ,rust-stream-assert-0.1)))) + (home-page "https://github.com/jplatte/eyeball") + (synopsis "Observable collections based on the `im` crate") + (description "Observable collections based on the `im` crate.") + (license license:mpl2.0))) + +(define-public rust-eyeball-im-util-0.5 + (package + (name "rust-eyeball-im-util") + (version "0.5.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "eyeball-im-util" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0q4r3qi46s8mnvn2y9pk322y4qdl4j81pa53q7xg4c9zncma5zn0")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-arrayvec" ,rust-arrayvec-0.7) + ("rust-eyeball-im" ,rust-eyeball-im-0.4) + ("rust-futures-core" ,rust-futures-core-0.3) + ("rust-imbl" ,rust-imbl-2) + ("rust-pin-project-lite" ,rust-pin-project-lite-0.2) + ("rust-smallvec" ,rust-smallvec-1)) + #:cargo-development-inputs + (("rust-eyeball" ,rust-eyeball-0.8) + ("rust-futures-util" ,rust-futures-util-0.3) + ("rust-stream-assert" ,rust-stream-assert-0.1) + ("rust-tokio" ,rust-tokio-1)))) + (home-page "https://github.com/jplatte/eyeball") + (synopsis "Helpful utilities for `eyeball-im`") + (description "Helpful utilities for `eyeball-im`.") + (license license:mpl2.0))) + (define-public rust-eyre-0.6 (package (name "rust-eyre") @@ -22769,6 +25379,28 @@ handling type for easy idiomatic error handling and reporting in Rust.") (description "Simple file accessibility checks in rust.") (license license:expat))) +(define-public rust-fakeit-1 + (package + (name "rust-fakeit") + (version "1.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "fakeit" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0zsz58zfawf3zk9ig3n7dbd382lgndjx0xxngwsymilcgipr0bfi")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-libmath" ,rust-libmath-0.2) + ("rust-rand" ,rust-rand-0.6) + ("rust-simplerand" ,rust-simplerand-1) + ("rust-uuid" ,rust-uuid-0.8)))) + (home-page "https://github.com/PumpkinSeed/fakeit") + (synopsis "Fake data generator") + (description "Fake data generator library with 130+ functions.") + (license license:expat))) + (define-public rust-fake-simd-0.1 (package (name "rust-fake-simd") @@ -22871,18 +25503,17 @@ fallible format macro.") (description "Derives for the failure crate.") (license (list license:asl2.0 license:expat)))) -(define-public rust-fallible-iterator-0.2 +(define-public rust-fallible-iterator-0.3 (package (name "rust-fallible-iterator") - (version "0.2.0") + (version "0.3.0") (source - (origin - (method url-fetch) - (uri (crate-uri "fallible-iterator" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "1xq759lsr8gqss7hva42azn3whgrbrs2sd9xpn92c5ickxm1fhs4")))) + (origin + (method url-fetch) + (uri (crate-uri "fallible-iterator" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0ja6l56yka5vn4y4pk6hn88z0bpny7a8k1919aqjzp0j1yhy9k1a")))) (build-system cargo-build-system) (home-page "https://github.com/sfackler/rust-fallible-iterator") (synopsis "Fallible iterator traits") @@ -22890,8 +25521,20 @@ fallible format macro.") crate provides implementations for @code{Box}, @code{Vec}, @code{BTreeMap}, and @code{BTreeSet}. If the @code{std} feature is enabled, this crate additionally provides implementations for @code{HashMap} and @code{HashSet}.") - (license (list license:asl2.0 - license:expat)))) + (license (list license:expat license:asl2.0)))) + +(define-public rust-fallible-iterator-0.2 + (package + (inherit rust-fallible-iterator-0.3) + (name "rust-fallible-iterator") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "fallible-iterator" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1xq759lsr8gqss7hva42azn3whgrbrs2sd9xpn92c5ickxm1fhs4")))))) (define-public rust-fallible-streaming-iterator-0.1 (package @@ -22910,24 +25553,26 @@ provides implementations for @code{HashMap} and @code{HashSet}.") (description "Fallible streaming iteration") (license (list license:expat license:asl2.0)))) -(define-public rust-fancy-regex-0.11 +(define-public rust-fancy-regex-0.13 (package (name "rust-fancy-regex") - (version "0.11.0") + (version "0.13.0") (source (origin (method url-fetch) (uri (crate-uri "fancy-regex" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "18j0mmzfycibhxhhhfja00dxd1vf8x5c28lbry224574h037qpxr")))) + (base32 "1wjbqjsdj8fkq6z2i9llq25iaqzd9f208vxnwg8mdbr2ba1lc7jk")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-bit-set" ,rust-bit-set-0.5) - ("rust-regex" ,rust-regex-1)) - #:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.3) + ("rust-regex-automata" ,rust-regex-automata-0.4) + ("rust-regex-syntax" ,rust-regex-syntax-0.8)) + #:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.5) ("rust-matches" ,rust-matches-0.1) - ("rust-quickcheck" ,rust-quickcheck-1)))) + ("rust-quickcheck" ,rust-quickcheck-1) + ("rust-regex" ,rust-regex-1)))) (home-page "https://github.com/fancy-regex/fancy-regex") (synopsis "Implementation of regexes with a rich set of features") (description @@ -22938,6 +25583,25 @@ implement features such as look-around and backtracking, which are not supported in purely NFA-based implementations.") (license license:expat))) +(define-public rust-fancy-regex-0.11 + (package + (inherit rust-fancy-regex-0.13) + (name "rust-fancy-regex") + (version "0.11.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "fancy-regex" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "18j0mmzfycibhxhhhfja00dxd1vf8x5c28lbry224574h037qpxr")))) + (arguments + `(#:cargo-inputs (("rust-bit-set" ,rust-bit-set-0.5) + ("rust-regex" ,rust-regex-1)) + #:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.3) + ("rust-matches" ,rust-matches-0.1) + ("rust-quickcheck" ,rust-quickcheck-1)))))) + (define-public rust-fancy-regex-0.7 (package (inherit rust-fancy-regex-0.11) @@ -22978,6 +25642,29 @@ supported in purely NFA-based implementations.") is defined in the HTML specification.") (license license:mpl2.0))) +(define-public rust-fast-float-0.2 + (package + (name "rust-fast-float") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "fast-float" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0g7kfll3xyh99kc7r352lhljnwvgayxxa6saifb6725inikmyxlm")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-development-inputs (("rust-fastrand" ,rust-fastrand-1) + ("rust-hexf-parse" ,rust-hexf-parse-0.1) + ("rust-lexical-core" ,rust-lexical-core-0.7) + ("rust-num-bigint" ,rust-num-bigint-0.3) + ("rust-ryu" ,rust-ryu-1)))) + (home-page "https://github.com/aldanor/fast-float-rust") + (synopsis "Fast floating-point number parser") + (description "This package provides a fast floating-point number parser.") + (license (list license:expat license:asl2.0)))) + (define-public rust-faster-hex-0.9 (package (name "rust-faster-hex") @@ -23113,8 +25800,32 @@ is defined in the HTML specification.") ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3) ("rust-wyhash" ,rust-wyhash-0.5)))))) +(define-public rust-fd-lock-4 + (package + (name "rust-fd-lock") + (version "4.0.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "fd-lock" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0ixrsd19k2cpl773p9hd0yk3hac684d9aphbxy0jq9q64bd6hmvy")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-1) + ("rust-rustix" ,rust-rustix-0.38) + ("rust-windows-sys" ,rust-windows-sys-0.52)) + #:cargo-development-inputs (("rust-tempfile" ,rust-tempfile-3)))) + (home-page "https://github.com/yoshuawuyts/fd-lock") + (synopsis "Advisory lock on a file") + (description "Fd-lock provides an advisory lock on a file using a file +descriptor to it.") + (license (list license:expat license:asl2.0)))) + (define-public rust-fd-lock-3 (package + (inherit rust-fd-lock-4) (name "rust-fd-lock") (version "3.0.12") (source @@ -23124,20 +25835,12 @@ is defined in the HTML specification.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "0hlnn1302p37qlc9xl2k5y0vw8q8id5kg59an6riy89hjlynpbir")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-1) ("rust-rustix" ,rust-rustix-0.37) ("rust-windows-sys" ,rust-windows-sys-0.48)) - #:cargo-development-inputs - (("rust-tempfile" ,rust-tempfile-3)))) - (home-page "https://github.com/yoshuawuyts/fd-lock") - (synopsis "Advisory lock on a file") - (description - "Fd-lock provides an advisory lock on a file using a file descriptor to -it.") - (license (list license:expat license:asl2.0)))) + #:cargo-development-inputs (("rust-tempfile" ,rust-tempfile-3)))))) (define-public rust-fd-lock-2 (package @@ -23157,6 +25860,28 @@ it.") (("rust-libc" ,rust-libc-0.2) ("rust-winapi" ,rust-winapi-0.3)))))) +(define-public rust-fdeflate-0.3 + (package + (name "rust-fdeflate") + (version "0.3.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "fdeflate" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0ig65nz4wcqaa3y109sh7yv155ldfyph6bs2ifmz1vad1vizx6sg")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-simd-adler32" ,rust-simd-adler32-0.3)) + #:cargo-development-inputs (("rust-miniz-oxide" ,rust-miniz-oxide-0.7) + ("rust-rand" ,rust-rand-0.8)))) + (home-page "https://github.com/image-rs/fdeflate") + (synopsis "Fast specialized deflate implementation") + (description + "This package provides a fast, specialized deflate implementation.") + (license (list license:expat license:asl2.0)))) + (define-public rust-fdlimit-0.1 (package (name "rust-fdlimit") @@ -23604,22 +26329,37 @@ prime field implementations in rust.") ("rust-quote" ,rust-quote-1) ("rust-syn" ,rust-syn-1)))))) -(define-public rust-fiat-crypto-0.1 +(define-public rust-figment-0.10 (package - (name "rust-fiat-crypto") - (version "0.1.11") + (name "rust-figment") + (version "0.10.15") (source (origin (method url-fetch) - (uri (crate-uri "fiat-crypto" version)) + (uri (crate-uri "figment" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "12gyr01z3bkahbxcrj2nsdq42qbqgq12w32dvpr6a7930i0qfxi1")))) + (base32 "1dnfri2371wzmk7lcxfd121z35b1b2251d93yc23w8b7f1z6fw3j")))) (build-system cargo-build-system) - (home-page "https://github.com/mit-plv/fiat-crypto") - (synopsis "Fiat-crypto generated Rust") - (description "This crate provides the extracted Rust code from the Coq -@code{fiat-crypto} libraries.") + (arguments + `(#:tests? #f ; unresolved import `figment::providers::Toml` + #:cargo-inputs (("rust-atomic" ,rust-atomic-0.6) + ("rust-parking-lot" ,rust-parking-lot-0.12) + ("rust-pear" ,rust-pear-0.2) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-serde-yaml" ,rust-serde-yaml-0.9) + ("rust-tempfile" ,rust-tempfile-3) + ("rust-toml" ,rust-toml-0.8) + ("rust-uncased" ,rust-uncased-0.9) + ("rust-version-check" ,rust-version-check-0.9)) + #:cargo-development-inputs (("rust-clap" ,rust-clap-4) + ("rust-parking-lot" ,rust-parking-lot-0.12) + ("rust-serde" ,rust-serde-1) + ("rust-tempfile" ,rust-tempfile-3)))) + (home-page "https://github.com/SergioBenitez/Figment") + (synopsis "Configuration library") + (description "This package provides an opinionated configuration library.") (license (list license:expat license:asl2.0)))) (define-public rust-file-diff-1 @@ -23639,6 +26379,30 @@ prime field implementations in rust.") (description "An atomic utility for diffing files in testing.") (license license:bsd-3))) +(define-public rust-file-id-0.2 + (package + (name "rust-file-id") + (version "0.2.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "file-id" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1jdg9xq830hghzrqkbnx8nda58a7z6mh8b6vlg5mj87v4l2ji135")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-serde" ,rust-serde-1) + ("rust-windows-sys" ,rust-windows-sys-0.48)) + #:cargo-development-inputs (("rust-tempfile" ,rust-tempfile-3)))) + (home-page "https://github.com/notify-rs/notify") + (synopsis + "Utility for reading inode numbers (Linux, MacOS) and file IDs (Windows)") + (description + "This package provides a utility for reading inode numbers (Linux, +@code{MacOS}) and file IDs (Windows).") + (license (list license:expat license:asl2.0)))) + (define-public rust-filedescriptor-0.8 (package (name "rust-filedescriptor") @@ -23689,7 +26453,7 @@ sparse files.") (define-public rust-filetime-0.2 (package (name "rust-filetime") - (version "0.2.22") + (version "0.2.23") (source (origin (method url-fetch) @@ -23697,14 +26461,14 @@ sparse files.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1w1a4zb4ciqjl1chvp9dplbacq07jv97pkdn0pzackbk7vfrw0nl")))) + "1za0sbq7fqidk8aaq9v7m9ms0sv8mmi49g6p5cphpan819q4gr0y")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-1) ("rust-libc" ,rust-libc-0.2) - ("rust-redox-syscall" ,rust-redox-syscall-0.3) - ("rust-windows-sys" ,rust-windows-sys-0.48)) + ("rust-redox-syscall" ,rust-redox-syscall-0.4) + ("rust-windows-sys" ,rust-windows-sys-0.52)) #:cargo-development-inputs (("rust-tempfile" ,rust-tempfile-3)))) (home-page "https://github.com/alexcrichton/filetime") @@ -23738,6 +26502,29 @@ representation.") ("rust-libc" ,rust-libc-0.2) ("rust-redox-syscall" ,rust-redox-syscall-0.1)))))) +(define-public rust-filetreelist-0.5 + (package + (name "rust-filetreelist") + (version "0.5.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "filetreelist" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0i7lnk5ncbjg2nfgadx8phmv7ihaak5872cclrdv54bl620id132")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-thiserror" ,rust-thiserror-1)) + #:cargo-development-inputs + (("rust-pretty-assertions" ,rust-pretty-assertions-1)))) + (home-page "https://github.com/extrawurst/gitui") + (synopsis "Filetree abstraction") + (description + "Filetree abstraction based on a sorted path list, supports key based +navigation events, folding, scrolling and more.") + (license license:expat))) + (define-public rust-field-offset-0.3 (package (name "rust-field-offset") @@ -23831,6 +26618,29 @@ cross platform API.") (license (list license:asl2.0 license:expat)))) +(define-public rust-finl-unicode-1 + (package + (name "rust-finl-unicode") + (version "1.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "finl_unicode" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1ipdx778849czik798sjbgk5yhwxqybydac18d2g9jb20dxdrkwg")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-bstr" ,rust-bstr-1) + ("rust-criterion" ,rust-criterion-0.3) + ("rust-unicode-categories" ,rust-unicode-categories-0.1) + ("rust-unicode-segmentation" ,rust-unicode-segmentation-1)))) + (home-page "https://github.com/dahosek/finl_unicode") + (synopsis "Unicode handling library") + (description "Library for handling Unicode functionality.") + (license (list license:expat license:asl2.0)))) + (define-public rust-fixed-1 (package (name "rust-fixed") @@ -24493,6 +27303,40 @@ implementation that is more efficient for smaller hash keys.") ("rust-walkdir" ,rust-walkdir-2) ("rust-winapi" ,rust-winapi-0.3)))))) +(define-public rust-font8x8-0.3 + (package + (name "rust-font8x8") + (version "0.3.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "font8x8" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0znh67wfv3pyx12619rm8v59fc3ig2ai6pfgqxl855hsf6w8hm47")))) + (build-system cargo-build-system) + (home-page "https://gitlab.com/saibatizoku/font8x8-rs") + (synopsis "8x8 monochrome bitmap font") + (description "8x8 monochrome bitmap font for rendering.") + (license license:expat))) + +(define-public rust-force-send-sync-1 + (package + (name "rust-force-send-sync") + (version "1.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "force-send-sync" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1dpy69psypanm8mx3k0mjmvb0mccyyd8yffcdr1899la8k68ss1j")))) + (build-system cargo-build-system) + (home-page "https://github.com/pacman82/force-send-sync") + (synopsis "Unsafe wrappers to force Send and Sync") + (description "Unsafe wrappers to force Send and Sync.") + (license license:expat))) + (define-public rust-foreign-types-0.5 (package (name "rust-foreign-types") @@ -24625,6 +27469,23 @@ implementation that is more efficient for smaller hash keys.") (base32 "0jxgzd04ra4imjv8jgkmdq59kj8fsz6w4zxsbmlai34h26225c00")))))) +(define-public rust-foreign-vec-0.1 + (package + (name "rust-foreign-vec") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "foreign_vec" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0wv6p8yfahcqbdg2wg7wxgj4dm32g2b6spa5sg5sxg34v35ha6zf")))) + (build-system cargo-build-system) + (home-page "https://github.com/DataEngineeringLabs/foreign_vec") + (synopsis "Unofficial implementation of Apache Arrow spec in safe Rust") + (description "Unofficial implementation of Apache Arrow spec in safe Rust.") + (license license:expat))) + (define-public rust-fork-0.1 (package (name "rust-fork") @@ -24670,25 +27531,40 @@ the controling terminal (daemon) using the fork and setsid syscalls.") syntax, as used by HTML forms.") (license (list license:expat license:asl2.0)))) -(define-public rust-fragile-1 +(define-public rust-fragile-2 (package (name "rust-fragile") - (version "1.0.0") + (version "2.0.0") (source (origin (method url-fetch) (uri (crate-uri "fragile" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1wlihmkjyhvl5rckal32p010piy1l15s6l81h7z31jcd971kk839")))) + (base32 "1ajfdnwdn921bhjlzyvsqvdgci8ab40ln6w9ly422lf8svb428bc")))) (build-system cargo-build-system) - (arguments `(#:skip-build? #t)) - (home-page "https://github.com/mitsuhiko/rust-fragile") + (arguments + `(#:cargo-inputs (("rust-slab" ,rust-slab-0.4)))) + (home-page "https://github.com/mitsuhiko/fragile") (synopsis "Wrapper types for sending non-send values to other threads") (description "This package provides wrapper types for sending non-send values to other threads.") (license license:asl2.0))) +(define-public rust-fragile-1 + (package + (inherit rust-fragile-2) + (name "rust-fragile") + (version "1.2.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "fragile" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1s2rz4cmmba5zi0gf2h6hprrcrf0wm83c1y45sdls09z99f4qimp")))) + (arguments `(#:cargo-inputs (("rust-fragile" ,rust-fragile-2)))))) + (define-public rust-freetype-0.7 (package (name "rust-freetype") @@ -25212,46 +28088,33 @@ references by lifting access permissions into the trait system.") (define-public rust-funty-1 (package + (inherit rust-funty-2) (name "rust-funty") - (version "1.2.0") + (version "1.1.0") (source (origin (method url-fetch) (uri (crate-uri "funty" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "07lb1f8yih3g694id3n90anlgxf8m6p98bllsnn6dmb5rfwsniqq")))) - (build-system cargo-build-system) + (base32 "19wx3p3jmv863y0mjb56sr4qf1kvqhl3fsyslkd92zli0p8lrlzy")))) (arguments `(#:cargo-development-inputs - (("rust-static-assertions" ,rust-static-assertions-1)))) - (home-page "https://github.com/myrrlyn/funty") - (synopsis "Trait generalization over the primitive types") - (description - "Prior to 1.0, Rust had traits for the numeric primitive types to permit -code to generalize over which specific type it accepted. This was never -stabilized, and eventually removed. This library reïnstates these traits.") - (license license:expat))) + (("rust-static-assertions" ,rust-static-assertions-1)))))) -(define-public rust-funty-1.1 +(define-public rust-funty-1.2.0-yanked (package (inherit rust-funty-1) (name "rust-funty") - (version "1.1.0") + (version "1.2.0") ; This version was yanked! (source (origin (method url-fetch) (uri (crate-uri "funty" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "19wx3p3jmv863y0mjb56sr4qf1kvqhl3fsyslkd92zli0p8lrlzy")))) - (arguments - `(#:cargo-development-inputs - (("rust-static-assertions" ,rust-static-assertions-1)))))) + (base32 "07lb1f8yih3g694id3n90anlgxf8m6p98bllsnn6dmb5rfwsniqq")))) + (properties '((crate-version-yanked? . #t))))) (define-public rust-futf-0.1 (package @@ -25453,6 +28316,40 @@ the computation on the threads themselves.") (license (list license:asl2.0 license:expat)))) +(define-public rust-futures-enum-0.1 + (package + (name "rust-futures-enum") + (version "0.1.17") + (source + (origin + (method url-fetch) + (uri (crate-uri "futures-enum" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "07kvpnr21qalhw4hw44h3335wi0lgrdf02n1vglm4flhwx6x28il")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-derive-utils" ,rust-derive-utils-0.11) + ("rust-find-crate" ,rust-find-crate-0.6) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)) + #:cargo-development-inputs + (("rust-futures" ,rust-futures-0.1) + ("rust-futures" ,rust-futures-0.3) + ("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)))) + (home-page "https://github.com/taiki-e/futures-enum") + (synopsis + "Future, Stream, Sink, AsyncRead, AsyncWrite, AsyncSeek, AsyncBufRead for enums") + (description + "This crate provides @code{#[derive(Future, Stream, Sink, AsyncRead, AsyncWrite, +AsyncSeek, AsyncBufRead)]} for enums.") + (license (list license:asl2.0 license:expat)))) + + (define-public rust-futures-executor-0.3 (package (name "rust-futures-executor") @@ -26125,6 +29022,47 @@ derived from an internal hasher used in FireFox and Rustc.") time, for nonorderable alphabets.") (license (list license:expat license:asl2.0)))) +(define-public rust-gat-std-0.1 + (package + (name "rust-gat-std") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "gat-std" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "14v4ldnzi8y8zkcj2qq7rj4af5ygk0s9iklflssxpcdgqzsfp3p0")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-gat-std-proc" ,rust-gat-std-proc-0.1)))) + (home-page "https://github.com/CraftSpider/gat-std") + (synopsis "Variants of Rust std traits that use GATs") + (description "This package provides variants of Rust std traits that +use GATs.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-gat-std-proc-0.1 + (package + (name "rust-gat-std-proc") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "gat-std-proc" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0br6d92fg4g7s81lsms6q3ayss1bl19fanqxc7v1csnic2vaw84c")))) + (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/CraftSpider/gat-std") + (synopsis "Proc macros for gat-std") + (description "This package provides proc macros for @code{gat-std}.") + (license (list license:expat license:asl2.0)))) + (define-public rust-gcc-0.3 (package (name "rust-gcc") @@ -26525,14 +29463,14 @@ platforms.") (define-public rust-getrandom-0.2 (package (name "rust-getrandom") - (version "0.2.10") + (version "0.2.12") (source (origin (method url-fetch) (uri (crate-uri "getrandom" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "09zlimhhskzf7cmgcszix05wyz2i6fcpvh711cv1klsxl6r3chdy")))) + (base32 "1d8jb9bv38nkwlqqdjcav6gxckgwc9g30pm3qq506rvncpm9400r")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -26556,27 +29494,27 @@ retrieving random data from system source.") (package (inherit rust-getrandom-0.2) (name "rust-getrandom") - (version "0.1.14") + (version "0.1.16") (source (origin (method url-fetch) (uri (crate-uri "getrandom" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "1sq30li71h19rhnhs1h6576ja68insajx8wvh1nn088r8pc8vg3s")))) + (base32 "1kjzmz60qx9mn615ks1akjbf36n3lkv27zfwbcam0fzmj56wphwg")))) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-cfg-if" ,rust-cfg-if-0.1) + `(#:cargo-inputs + (("rust-cfg-if" ,rust-cfg-if-1) ("rust-compiler-builtins" ,rust-compiler-builtins-0.1) - ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2) + ("rust-js-sys" ,rust-js-sys-0.3) ("rust-libc" ,rust-libc-0.2) ("rust-log" ,rust-log-0.4) + ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1) ("rust-stdweb" ,rust-stdweb-0.4) ("rust-wasi" ,rust-wasi-0.9) - ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1)))))) + ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)) + #:cargo-development-inputs + (("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.2)))))) (define-public rust-getset-0.1 (package @@ -26735,6 +29673,27 @@ getters and setters on fields.") pointers above 2G.") (license license:gpl3))) +(define-public rust-gh-emoji-1 + (package + (name "rust-gh-emoji") + (version "1.0.8") + (source + (origin + (method url-fetch) + (uri (crate-uri "gh-emoji" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0dwc7kr1dsb4bn8n87x7363c2c6vc4pi9fy6s74nk0r8vxhxz2pb")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-phf" ,rust-phf-0.11) + ("rust-regex" ,rust-regex-1)))) + (home-page "https://lib.rs/crates/gh-emoji") + (synopsis "Convert @code{:emoji:} to Unicode") + (description + "Convert @code{:emoji:} to Unicode using @code{GitHub's} emoji names.") + (license license:expat))) + (define-public rust-ghost-0.1 (package (name "rust-ghost") @@ -26762,8 +29721,37 @@ permitted in ordinary Rust.") ;; Either license can be chosen at the users option. (license (list license:expat license:asl2.0)))) +(define-public rust-gimli-0.28 + (package + (name "rust-gimli") + (version "0.28.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "gimli" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0lv23wc8rxvmjia3mcxc6hj9vkqnv1bqq0h8nzjcgf71mrxx6wa2")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-compiler-builtins" ,rust-compiler-builtins-0.1) + ("rust-fallible-iterator" ,rust-fallible-iterator-0.3) + ("rust-indexmap" ,rust-indexmap-2) + ("rust-rustc-std-workspace-alloc" ,rust-rustc-std-workspace-alloc-1) + ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1) + ("rust-stable-deref-trait" ,rust-stable-deref-trait-1)) + #:cargo-development-inputs (("rust-test-assembler" ,rust-test-assembler-0.1)))) + (home-page "https://github.com/gimli-rs/gimli") + (synopsis "Library for reading and writing the DWARF debugging format") + (description + "This package provides a library for reading and writing the DWARF +debugging format.") + (license (list license:expat license:asl2.0)))) + (define-public rust-gimli-0.27 (package + (inherit rust-gimli-0.28) (name "rust-gimli") (version "0.27.2") (source (origin @@ -26773,7 +29761,6 @@ permitted in ordinary Rust.") (sha256 (base32 "1d5v6jjchf4872jynjsg5ni4vankm1341bas8qindygb6g9962md")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-compiler-builtins" ,rust-compiler-builtins-0.1) @@ -26791,13 +29778,7 @@ permitted in ordinary Rust.") ("rust-rayon" ,rust-rayon-1) ("rust-regex" ,rust-regex-1) ("rust-test-assembler" ,rust-test-assembler-0.1) - ("rust-typed-arena" ,rust-typed-arena-2)))) - (home-page "https://github.com/gimli-rs/gimli") - (synopsis "Library for reading and writing the DWARF debugging format") - (description - "This package provides a library for reading and writing the DWARF -debugging format.") - (license (list license:expat license:asl2.0)))) + ("rust-typed-arena" ,rust-typed-arena-2)))))) (define-public rust-gimli-0.26 (package @@ -27129,8 +30110,48 @@ graphics.") graphics.") (license (list license:expat license:asl2.0)))) +(define-public rust-glium-0.32 + (package + (name "rust-glium") + (version "0.32.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "glium" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1gwknlxblg5hlwjg91y8pp5slr9dnca7cs1x3nwi8q5qxhl6fxnj")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; Creating EventLoop multiple times is not supported. + #:cargo-inputs (("rust-backtrace" ,rust-backtrace-0.3) + ("rust-fnv" ,rust-fnv-1) + ("rust-gl-generator" ,rust-gl-generator-0.14) + ("rust-glutin" ,rust-glutin-0.29) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-memoffset" ,rust-memoffset-0.6) + ("rust-smallvec" ,rust-smallvec-1) + ("rust-takeable-option" ,rust-takeable-option-0.5)) + #:cargo-development-inputs (("rust-cgmath" ,rust-cgmath-0.18) + ("rust-genmesh" ,rust-genmesh-0.6) + ("rust-image" ,rust-image-0.24) + ("rust-libc" ,rust-libc-0.2) + ("rust-obj" ,rust-obj-0.10) + ("rust-ouroboros" ,rust-ouroboros-0.15) + ("rust-rand" ,rust-rand-0.8)))) + (native-inputs (list pkg-config)) + (inputs (list expat fontconfig freetype)) + (home-page "https://github.com/glium/glium") + (synopsis "OpenGL wrapper") + (description + "Glium is an intermediate layer between OpenGL and your application. You +still need to manually handle the graphics pipeline, but without having to use +OpenGL's old and error-prone API.") + (license license:asl2.0))) + (define-public rust-glium-0.31 (package + (inherit rust-glium-0.32) (name "rust-glium") (version "0.31.0") (source @@ -27141,7 +30162,6 @@ graphics.") (sha256 (base32 "06cfsq3mgjlq3bnxv7jh5bb5is7040xyvf8cf1x45vnq8fdz1d0a")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #true ;XXX circular dependencies #:cargo-inputs @@ -27157,14 +30177,7 @@ graphics.") ("rust-genmesh" ,rust-genmesh-0.6) ("rust-gl-generator" ,rust-gl-generator-0.14) ("rust-obj" ,rust-obj-0.10) - ("rust-ouroboros" ,rust-ouroboros-0.14)))) - (home-page "https://github.com/glium/glium") - (synopsis "OpenGL wrapper") - (description - "Glium is an intermediate layer between OpenGL and your application. You -still need to manually handle the graphics pipeline, but without having to use -OpenGL's old and error-prone API.") - (license license:asl2.0))) + ("rust-ouroboros" ,rust-ouroboros-0.14)))))) (define-public rust-glium-0.25 (package @@ -27305,25 +30318,24 @@ inherits many goodies from both, such as limiting search depth and amount of open file descriptors.") (license license:expat))) -(define-public rust-gloo-timers-0.2 +(define-public rust-gloo-timers-0.3 (package (name "rust-gloo-timers") - (version "0.2.1") + (version "0.3.0") (source (origin (method url-fetch) (uri (crate-uri "gloo-timers" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "07w999jm1r1i8r574qbmsa3l4w3gxhyx04cbllg0m4pzm934l827")))) + (base32 "1519157n7xppkk6pdw5w52vy1llzn5iljkqd7q1h5609jv7l7cdv")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-futures-channel" ,rust-futures-channel-0.3) ("rust-futures-core" ,rust-futures-core-0.3) ("rust-js-sys" ,rust-js-sys-0.3) - ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2) - ("rust-web-sys" ,rust-web-sys-0.3)) + ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)) #:cargo-development-inputs (("rust-futures-util" ,rust-futures-util-0.3) ("rust-wasm-bindgen-futures" ,rust-wasm-bindgen-futures-0.4) @@ -27335,6 +30347,19 @@ open file descriptors.") timers.") (license (list license:expat license:asl2.0)))) +(define-public rust-gloo-timers-0.2 + (package + (inherit rust-gloo-timers-0.3) + (name "rust-gloo-timers") + (version "0.2.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "gloo-timers" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0p2yqcxw0q9kclhwpgshq1r4ijns07nmmagll3lvrgl7pdk5m6cv")))))) + (define-public rust-gmp-mpfr-sys-1 (package (name "rust-gmp-mpfr-sys") @@ -27433,6 +30458,32 @@ and loading crate.") ("rust-plain" ,rust-plain-0.2) ("rust-scroll" ,rust-scroll-0.11)))))) +(define-public rust-graphql-parser-0.3 + (package + (name "rust-graphql-parser") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "graphql-parser" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1wp6vnrhgi6q3b942zkc6p4mi104gbw71pnc0d5c1ps7ab7d9ayi")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-combine" ,rust-combine-3) + ("rust-thiserror" ,rust-thiserror-1)) + #:cargo-development-inputs + (("rust-pretty-assertions" ,rust-pretty-assertions-0.5)))) + (home-page "https://github.com/graphql-rust/graphql-parser") + (synopsis + "Parser, AST and serializer for graphql query language") + (description + "This package provides a parser, AST and serializer for graphql query +language and scheme definition language (sometimes called IDL).") + (license (list license:expat license:asl2.0)))) + (define-public rust-greetd-ipc-0.9 (package (name "rust-greetd-ipc") @@ -27716,6 +30767,36 @@ provides standard printing of search results, similar to grep itself.") "Fast line oriented regex searching as a library.") (license (list license:unlicense license:expat)))) +(define-public rust-griddle-0.5 + (package + (name "rust-griddle") + (version "0.5.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "griddle" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0qv3ynh0dzfjqz3wxz8yfkda1jxz8jam9mhjrlbv328v34i1vf3b")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-ahash" ,rust-ahash-0.7) + ("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-lazy-static" ,rust-lazy-static-1) + ("rust-quickcheck" ,rust-quickcheck-1) + ("rust-rand" ,rust-rand-0.8) + ("rust-rayon" ,rust-rayon-1) + ("rust-serde-test" ,rust-serde-test-1)))) + (home-page "https://github.com/jonhoo/griddle.git") + (synopsis "HashMap variant that spreads resize load across inserts") + (description + "This package provides a @code{HashMap} variant that spreads resize load +across inserts.") + (license (list license:expat license:asl2.0)))) + (define-public rust-group-0.13 (package (name "rust-group") @@ -27939,20 +31020,111 @@ IEEE 754-2008 binary16 type.") ("rust-quickcheck-macros" ,rust-quickcheck-macros-1) ("rust-rand" ,rust-rand-0.8)))))) +(define-public rust-halfbrown-0.2 + (package + (name "rust-halfbrown") + (version "0.2.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "halfbrown" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0vzg46039pd730vc2hdhl09h86j4cd007awwlrf8l407hqd6d245")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-arrayvec" ,rust-arrayvec-0.7) + ("rust-hashbrown" ,rust-hashbrown-0.14) + ("rust-rustc-hash" ,rust-rustc-hash-1) + ("rust-serde" ,rust-serde-1)) + #:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.5)))) + (home-page "https://github.com/Licenser/halfbrown") + (synopsis "Multi backend HashMap for different key space sizes") + (description "This package provides a multi backend @code{HashMap} for +higher performance on different key space sizes.") + (license (list license:asl2.0 license:expat)))) + +(define-public rust-handlebars-5 + (package + (name "rust-handlebars") + (version "5.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "handlebars" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1r51g648z3skfp65xysh3zcai1qlm7z405izxqfnjrlyp5v38a5b")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-heck" ,rust-heck-0.4) + ("rust-log" ,rust-log-0.4) + ("rust-pest" ,rust-pest-2) + ("rust-pest-derive" ,rust-pest-derive-2) + ("rust-rhai" ,rust-rhai-1) + ("rust-rust-embed" ,rust-rust-embed-8) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-walkdir" ,rust-walkdir-2)) + #:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.5) + ("rust-env-logger" ,rust-env-logger-0.10) + ("rust-pprof" ,rust-pprof-0.13) + ("rust-serde-derive" ,rust-serde-derive-1) + ("rust-tempfile" ,rust-tempfile-3) + ("rust-time" ,rust-time-0.3) + ("rust-tiny-http" ,rust-tiny-http-0.12)))) + (home-page "https://github.com/sunng87/handlebars-rust") + (synopsis "Handlebars templating implemented in Rust") + (description "Handlebars templating implemented in Rust.") + (license license:expat))) + +(define-public rust-handlebars-4 + (package + (inherit rust-handlebars-5) + (name "rust-handlebars") + (version "4.5.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "handlebars" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "09dj4rk6r9ngy1ki34mppcqq4pcnlhjd02yhnf724qpkkympp9ps")))) + (arguments + `(#:cargo-inputs (("rust-heck" ,rust-heck-0.4) + ("rust-log" ,rust-log-0.4) + ("rust-pest" ,rust-pest-2) + ("rust-pest-derive" ,rust-pest-derive-2) + ("rust-rhai" ,rust-rhai-1) + ("rust-rust-embed" ,rust-rust-embed-8) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-walkdir" ,rust-walkdir-2)) + #:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.3) + ("rust-env-logger" ,rust-env-logger-0.9) + ("rust-pprof" ,rust-pprof-0.10) + ("rust-serde-derive" ,rust-serde-derive-1) + ("rust-tempfile" ,rust-tempfile-3) + ("rust-time" ,rust-time-0.3) + ("rust-tiny-http" ,rust-tiny-http-0.11)))) + (native-inputs (list protobuf)))) + (define-public rust-home-0.5 (package (name "rust-home") - (version "0.5.5") + (version "0.5.9") (source (origin (method url-fetch) (uri (crate-uri "home" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1nqx1krijvpd03d96avsdyknd12h8hs3xhxwgqghf8v9xxzc4i2l")))) + (base32 "19grxyg35rqfd802pcc9ys1q3lafzlcjcv2pl2s5q8xpyr5kblg3")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs (("rust-windows-sys" ,rust-windows-sys-0.48)))) + `(#:cargo-inputs (("rust-windows-sys" ,rust-windows-sys-0.52)))) (home-page "https://github.com/rust-lang/cargo") (synopsis "Shared definitions of home directories") (description "This package provides the definition of @code{home_dir} @@ -28003,27 +31175,41 @@ correct value of @samp{CARGO_HOME} and @samp{RUSTUP_HOME}.") already-hashed or hash-like data.") (license (list license:asl2.0 license:expat)))) -(define-public rust-hash32-0.2 +(define-public rust-hash32-0.3 (package (name "rust-hash32") - (version "0.2.1") + (version "0.3.1") (source (origin (method url-fetch) (uri (crate-uri "hash32" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0rrbv5pc5b1vax6j6hk7zvlrpw0h6aybshxy9vbpgsrgfrc5zhxh")))) + (base32 "01h68z8qi5gl9lnr17nz10lay8wjiidyjdyd60kqx8ibj090pmj7")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-byteorder" ,rust-byteorder-1)))) + `(#:cargo-inputs (("rust-byteorder" ,rust-byteorder-1)))) (home-page "https://github.com/japaric/hash32") (synopsis "32-bit hashing machinery") (description "This package provides 32-bit hashing machinery.") (license (list license:expat license:asl2.0)))) +(define-public rust-hash32-0.2 + (package + (inherit rust-hash32-0.3) + (name "rust-hash32") + (version "0.2.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "hash32" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0rrbv5pc5b1vax6j6hk7zvlrpw0h6aybshxy9vbpgsrgfrc5zhxh")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs (("rust-byteorder" ,rust-byteorder-1)))))) + (define-public rust-hash32-0.1 (package (inherit rust-hash32-0.2) @@ -28066,6 +31252,30 @@ already-hashed or hash-like data.") @code{#[derive(Hash32)]}.") (license (list license:expat license:asl2.0)))) +(define-public rust-hashbag-0.1 + (package + (name "rust-hashbag") + (version "0.1.12") + (source + (origin + (method url-fetch) + (uri (crate-uri "hashbag" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "14wx5rx11h0nb1rmlwmiw7719q2qf941x7ipcdg8yahb0sr99x4q")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-griddle" ,rust-griddle-0.5) + ("rust-serde" ,rust-serde-1)) + #:cargo-development-inputs (("rust-bincode" ,rust-bincode-1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1)))) + (home-page "https://github.com/jonhoo/hashbag.git") + (synopsis "Unordered multiset implementation using a hash bag") + (description + "This crate implements an unordered multiset implementation using a hash bag.") + (license (list license:expat license:asl2.0)))) + (define-public rust-hashbrown-0.14 (package (name "rust-hashbrown") @@ -28317,8 +31527,32 @@ hash map.") ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1) ("rust-serde" ,rust-serde-1)))))) +(define-public rust-hashlink-0.9 + (package + (name "rust-hashlink") + (version "0.9.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "hashlink" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1vi5nxldy84raw4jy0fq059xq7mnfha0y2gg7kfihxb0yzvslbk9")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-hashbrown" ,rust-hashbrown-0.14) + ("rust-serde" ,rust-serde-1)) + #:cargo-development-inputs (("rust-rustc-hash" ,rust-rustc-hash-1) + ("rust-serde-test" ,rust-serde-test-1)))) + (home-page "https://github.com/kyren/hashlink") + (synopsis "HashMap-like containers with user controllable order") + (description "This package provides HashMap-like containers that hold +their key-value pairs in a user controllable order.") + (license (list license:expat license:asl2.0)))) + (define-public rust-hashlink-0.8 (package + (inherit rust-hashlink-0.9) (name "rust-hashlink") (version "0.8.2") (source (origin @@ -28328,19 +31562,13 @@ hash map.") (sha256 (base32 "1ap6ar5jlqq6ln7d9r2j5079mbx0zg8643xacqyjwkqw96ws2q87")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-hashbrown" ,rust-hashbrown-0.13) ("rust-serde" ,rust-serde-1)) #:cargo-development-inputs (("rust-rustc-hash" ,rust-rustc-hash-1) - ("rust-serde-test" ,rust-serde-test-1)))) - (home-page "https://github.com/kyren/hashlink") - (synopsis "HashMap-like containers with user controllable order") - (description "This package provides HashMap-like containers that hold -their key-value pairs in a user controllable order.") - (license (list license:expat license:asl2.0)))) + ("rust-serde-test" ,rust-serde-test-1)))))) (define-public rust-hashlink-0.7 (package @@ -28397,8 +31625,35 @@ their key-value pairs in a user controllable order.") (description "This package provides a port of @code{HdrHistogram} to Rust.") (license (list license:expat license:asl2.0)))) +(define-public rust-heapless-0.8 + (package + (name "rust-heapless") + (version "0.8.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "heapless" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1b9zpdjv4qkl2511s2c80fz16fx9in4m9qkhbaa8j73032v9xyqb")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-defmt" ,rust-defmt-0.3) + ("rust-hash32" ,rust-hash32-0.3) + ("rust-portable-atomic" ,rust-portable-atomic-1) + ("rust-serde" ,rust-serde-1) + ("rust-stable-deref-trait" ,rust-stable-deref-trait-1) + ("rust-ufmt-write" ,rust-ufmt-write-0.1)) + #:cargo-development-inputs (("rust-ufmt" ,rust-ufmt-0.2)))) + (home-page "https://github.com/japaric/heapless") + (synopsis "Static friendly data structures") + (description "This package provides @code{static} friendly data structures +that don't require dynamic memory allocation.") + (license (list license:expat license:asl2.0)))) + (define-public rust-heapless-0.7 (package + (inherit rust-heapless-0.8) (name "rust-heapless") (version "0.7.16") (source @@ -28408,7 +31663,6 @@ their key-value pairs in a user controllable order.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "0hq7ifnzpdj9rc06rhys4qa3qkr6q3k01kwfca0ak7lbl4jbq16v")))) - (build-system cargo-build-system) (arguments `(#:cargo-test-flags '("--release" "--lib") @@ -28421,13 +31675,7 @@ their key-value pairs in a user controllable order.") ("rust-spin" ,rust-spin-0.9) ("rust-stable-deref-trait" ,rust-stable-deref-trait-1) ("rust-ufmt-write" ,rust-ufmt-write-0.1)) - #:cargo-development-inputs - (("rust-ufmt" ,rust-ufmt-0.1)))) - (home-page "https://github.com/rust-embedded/heapless") - (synopsis "Static friendly data structures") - (description "This package provides @code{static} friendly data structures -that don't require dynamic memory allocation.") - (license (list license:expat license:asl2.0)))) + #:cargo-development-inputs (("rust-ufmt" ,rust-ufmt-0.1)))))) (define-public rust-heapless-0.6 (package @@ -28542,29 +31790,41 @@ heap.") total runtime size of an object on the heap") (license license:mpl2.0))) -(define-public rust-heck-0.4 +(define-public rust-heck-0.5 (package (name "rust-heck") - (version "0.4.1") + (version "0.5.0") (source (origin (method url-fetch) (uri (crate-uri "heck" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1a7mqsnycv5z4z5vnv1k34548jzmc0ajic7c1j8jsaspnhw5ql4m")))) + (base32 "1sjmpsdl8czyh9ywl3qcsfsq9a307dg4ni2vnlwgnzzqhc4y0113")))) (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-unicode-segmentation" ,rust-unicode-segmentation-1)))) (home-page "https://github.com/withoutboats/heck") (synopsis "Case conversion library") (description "This library exists to provide case conversion between common cases like CamelCase and snake_case. It is intended to be unicode aware, internally consistent, and reasonably well performing.") - (license (list license:asl2.0 - license:expat)))) + (license (list license:expat license:asl2.0)))) + +(define-public rust-heck-0.4 + (package + (inherit rust-heck-0.5) + (name "rust-heck") + (version "0.4.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "heck" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1a7mqsnycv5z4z5vnv1k34548jzmc0ajic7c1j8jsaspnhw5ql4m")))) + (arguments + `(#:cargo-inputs + (("rust-unicode-segmentation" ,rust-unicode-segmentation-1)))))) (define-public rust-heck-0.3 (package @@ -28828,6 +32088,19 @@ float literals. Two functions @code{parse_hexf32} and @code{parse_hexf64} are provided for each type.") (license license:cc0))) +(define-public rust-hexf-parse-0.1 + (package + (inherit rust-hexf-parse-0.2) + (name "rust-hexf-parse") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "hexf-parse" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1b2h0lvksn8748764x46729ygpz8grack24spin0k29ssmr6yabr")))))) + (define-public rust-hostname-0.3 (package (name "rust-hostname") @@ -28892,35 +32165,60 @@ provided for each type.") (description "This package provides a wav encoding and decoding library.") (license license:asl2.0))) -(define-public rust-html5ever-0.26 +(define-public rust-html5ever-0.27 (package (name "rust-html5ever") - (version "0.26.0") + (version "0.27.0") (source (origin (method url-fetch) (uri (crate-uri "html5ever" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1dx3lhfwngi21wa79cpjv5rd4wn5vmklr50wrwbryidq92mqr9my")))) + "1m24sbpk572f5qhhkj4kkxvsd64rn968s0vxwvqlds76w2pp2dy1")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-log" ,rust-log-0.4) ("rust-mac" ,rust-mac-0.1) - ("rust-markup5ever" ,rust-markup5ever-0.11) + ("rust-markup5ever" ,rust-markup5ever-0.12) ("rust-proc-macro2" ,rust-proc-macro2-1) ("rust-quote" ,rust-quote-1) - ("rust-syn" ,rust-syn-1)) + ("rust-syn" ,rust-syn-2)) #:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.3) - ("rust-typed-arena" ,rust-typed-arena-1)))) + ("rust-typed-arena" ,rust-typed-arena-2)))) (home-page "https://github.com/servo/html5ever") (synopsis "High-performance browser-grade HTML5 parser") (description "This package provides a high-performance browser-grade HTML5 parser.") (license (list license:expat license:asl2.0)))) +(define-public rust-html5ever-0.26 + (package + (inherit rust-html5ever-0.27) + (name "rust-html5ever") + (version "0.26.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "html5ever" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1dx3lhfwngi21wa79cpjv5rd4wn5vmklr50wrwbryidq92mqr9my")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-log" ,rust-log-0.4) + ("rust-mac" ,rust-mac-0.1) + ("rust-markup5ever" ,rust-markup5ever-0.11) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)) + #:cargo-development-inputs + (("rust-criterion" ,rust-criterion-0.3) + ("rust-typed-arena" ,rust-typed-arena-1)))))) + (define-public rust-html5ever-0.25 (package (inherit rust-html5ever-0.26) @@ -29220,6 +32518,31 @@ characters in HTML, decoding and unescaping HTML entities as well.") and traversing, manipulating, and querying the document tree.") (license license:expat))) +(define-public rust-human-date-parser-0.1 + (package + (name "rust-human-date-parser") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "human-date-parser" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1g7hlbayw3jknj010jhrcxscyrgpz2s08q3v74337h7xs4x5pmlj")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; use of undeclared crate or module `concat_idents` + #:cargo-inputs (("rust-chrono" ,rust-chrono-0.4) + ("rust-pest" ,rust-pest-2) + ("rust-pest-derive" ,rust-pest-derive-2) + ("rust-thiserror" ,rust-thiserror-1)))) + (home-page "https://github.com/technologicalMayhem/human-date-parser") + (synopsis "Parse human-readable strings that express dates") + (description + "This package parses strings that express dates in a human way into ones +usable by code.") + (license license:expat))) + (define-public rust-human-format-1 (package (name "rust-human-format") @@ -29515,18 +32838,17 @@ SystemTime}}.") (define-public rust-iana-time-zone-haiku-0.1 (package (name "rust-iana-time-zone-haiku") - (version "0.1.1") + (version "0.1.2") (source (origin (method url-fetch) (uri (crate-uri "iana-time-zone-haiku" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1jix9qrqxclj9r4wkg7d3fr987d77vdg3qy2c5hl4ry19wlaw0q7")))) + (base32 "17r6jmj31chn7xs9698r122mapq85mfnv98bb4pg6spm0si2f67k")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-cxx" ,rust-cxx-1) - ("rust-cxx-build" ,rust-cxx-build-1)))) + (("rust-cc" ,rust-cc-1)))) (home-page "https://github.com/strawlab/iana-time-zone") (synopsis "IANA-time-zone support crate for Haiku OS") (description @@ -29536,14 +32858,14 @@ SystemTime}}.") (define-public rust-iana-time-zone-0.1 (package (name "rust-iana-time-zone") - (version "0.1.53") + (version "0.1.60") (source (origin (method url-fetch) (uri (crate-uri "iana-time-zone" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0ra7nvai8n3alvljswacjbnhfcpivpi7xqbc5n048w18gdk25hb4")))) + "0hdid5xz3jznm04lysjm3vi93h3c523w0hcc3xba47jl3ddbpzz7")))) (build-system cargo-build-system) (arguments `(#:tests? #f ; Not all files included. @@ -29553,7 +32875,7 @@ SystemTime}}.") ("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)) + ("rust-windows-core" ,rust-windows-core-0.52)) #:cargo-development-inputs (("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3)))) (home-page "https://github.com/strawlab/iana-time-zone") @@ -29847,6 +33169,35 @@ let} expressions.") ignore files such as @file{.gitignore} against file paths.") (license (list license:unlicense license:expat)))) +(define-public rust-ignore-files-1 + (package + (name "rust-ignore-files") + (version "1.3.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "ignore-files" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0ifzz6i2ypv1ffvnx75yflzzbv04jzgzil5lci25aik3bkcfsa17")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-dunce" ,rust-dunce-1) + ("rust-futures" ,rust-futures-0.3) + ("rust-gix-config" ,rust-gix-config-0.31) + ("rust-ignore" ,rust-ignore-0.4) + ("rust-miette" ,rust-miette-5) + ("rust-project-origins" ,rust-project-origins-1) + ("rust-radix-trie" ,rust-radix-trie-0.2) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-tokio" ,rust-tokio-1) + ("rust-tracing" ,rust-tracing-0.1)))) + (home-page "https://github.com/watchexec/watchexec") + (synopsis "Find, parse, and interpret ignore files") + (description "This package provides functions to find, parse, and interpret +ignore files.") + (license license:asl2.0))) + (define-public rust-im-rc-15 (package (name "rust-im-rc") @@ -29911,6 +33262,67 @@ variant of this library is available separately as @code{im}.") (description "This package provides a minimal terminfo libary.") (license license:asl2.0))) +(define-public rust-imbl-2 + (package + (name "rust-imbl") + (version "2.0.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "imbl" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "11bhchs0d1bbbmr8ari4y4d62vqxs7xg4fkhjlhgbv98h0n193cp")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-arbitrary" ,rust-arbitrary-1) + ("rust-bitmaps" ,rust-bitmaps-3) + ("rust-imbl-sized-chunks" ,rust-imbl-sized-chunks-0.1) + ("rust-proptest" ,rust-proptest-1) + ("rust-quickcheck" ,rust-quickcheck-1) + ("rust-rand-core" ,rust-rand-core-0.6) + ("rust-rand-xoshiro" ,rust-rand-xoshiro-0.6) + ("rust-rayon" ,rust-rayon-1) + ("rust-refpool" ,rust-refpool-0.4) + ("rust-serde" ,rust-serde-1) + ("rust-version-check" ,rust-version-check-0.9)) + #:cargo-development-inputs + (("rust-metrohash" ,rust-metrohash-1) + ("rust-pretty-assertions" ,rust-pretty-assertions-1) + ("rust-proptest" ,rust-proptest-1) + ("rust-proptest-derive" ,rust-proptest-derive-0.4) + ("rust-rand" ,rust-rand-0.8) + ("rust-rayon" ,rust-rayon-1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-static-assertions" ,rust-static-assertions-1)))) + (home-page "https://github.com/jneem/imbl") + (synopsis "Immutable collection datatypes") + (description "This crate provides immutable collection datatypes.") + (license license:mpl2.0))) + +(define-public rust-imbl-sized-chunks-0.1 + (package + (name "rust-imbl-sized-chunks") + (version "0.1.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "imbl-sized-chunks" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0qzdw55na2w6fd44p7y9rh05nxa98gzpaigmwg57sy7db3xhch0l")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-arbitrary" ,rust-arbitrary-1) + ("rust-array-ops" ,rust-array-ops-0.1) + ("rust-bitmaps" ,rust-bitmaps-3) + ("rust-refpool" ,rust-refpool-0.4)))) + (home-page "https://github.com/jneem/imbl-sized-chunks") + (synopsis "Sized chunk datatypes") + (description "This package provides sized chunk datatypes.") + (license license:mpl2.0))) + (define-public rust-impl-codec-0.5 (package (name "rust-impl-codec") @@ -29932,6 +33344,24 @@ variant of this library is available separately as @code{im}.") for uint and fixed hash.") (license (list license:expat license:asl2.0)))) +(define-public rust-impl-more-0.1 + (package + (name "rust-impl-more") + (version "0.1.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "impl-more" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0bdv06br4p766rcgihhjwqyz8fcz31xyaq14rr53vfh3kifafv10")))) + (build-system cargo-build-system) + (arguments (list #:tests? #f)) ; use of undeclared crate or module `eyre` + (home-page "https://github.com/robjtede/impl-more") + (synopsis "Concise, declarative trait implementation macros") + (description "Concise, declarative trait implementation macros.") + (license (list license:expat license:asl2.0)))) + (define-public rust-impl-rlp-0.3 (package (name "rust-impl-rlp") @@ -30005,6 +33435,23 @@ for @code{uint} and @code{fixed_hash}.") a trait for tuples.") (license (list license:asl2.0 license:expat)))) +(define-public rust-impls-1 + (package + (name "rust-impls") + (version "1.0.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "impls" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1g2i16vn99kmzfaag6df9bjg3k9p2p1jc3qdm5hqhlvhpmdn8iks")))) + (build-system cargo-build-system) + (home-page "https://github.com/nvzqz/impls") + (synopsis "Determine if a type implements a logical trait expression") + (description "Determine if a type implements a logical trait expression.") + (license (list license:expat license:asl2.0)))) + (define-public rust-include-dir-0.7 (package (name "rust-include-dir") @@ -30048,24 +33495,24 @@ a trait for tuples.") (description "The procedural macro used by include_dir.") (license license:expat))) -(define-public rust-include-flate-0.1 +(define-public rust-include-flate-0.2 (package (name "rust-include-flate") - (version "0.1.3") + (version "0.2.0") (source (origin (method url-fetch) (uri (crate-uri "include-flate" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0xd63rhr03ax1w327ws46wc9zyw5k9jsaxfy24j6wg9km3xhfqii")))) + (base32 "1c5dsx6j9jwrd6calhxdgip85qjy45hc8v1740fr61k46ilibqf2")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-include-flate-codegen-exports" ,rust-include-flate-codegen-exports-0.1) - ("rust-lazy-static" ,rust-lazy-static-1) - ("rust-libflate" ,rust-libflate-0.1)))) + `(#:skip-build? #t ; `#![feature]` may not be used on the stable release channel + #:cargo-inputs (("rust-include-flate-codegen-exports" + ,rust-include-flate-codegen-exports-0.1) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-libflate" ,rust-libflate-1)))) (home-page "https://github.com/SOF3/include-flate") (synopsis "Variant of @code{include_bytes!/include_str!} with compression") (description @@ -30073,26 +33520,45 @@ a trait for tuples.") with compile-time deflation and runtime lazy inflation.") (license license:asl2.0))) +(define-public rust-include-flate-0.1 + (package + (inherit rust-include-flate-0.2) + (name "rust-include-flate") + (version "0.1.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "include-flate" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0j71284rcjl2pnnrnvp2i4r9dyikpw939gcvz0f7qm91qx4v9p6z")))) + (arguments + `(#:skip-build? #t ; `#![feature]` may not be used on the stable release channel + #:cargo-inputs + (("rust-include-flate-codegen-exports" ,rust-include-flate-codegen-exports-0.1) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-libflate" ,rust-libflate-1)))))) + (define-public rust-include-flate-codegen-0.1 (package (name "rust-include-flate-codegen") - (version "0.1.3") + (version "0.1.4") (source (origin (method url-fetch) (uri (crate-uri "include-flate-codegen" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1mbw6fcczmfw4dabps4l90mdn2wdy9zhqwh60xx4fjcxqfsm9ksb")))) + (base32 "1s34ssq0l3d2sn8n3mxmkz3jbm600fbckd0213mjjcgs34a6wz9s")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t + `(#:skip-build? #t ; `#![feature]` may not be used on the stable release channel #:cargo-inputs - (("rust-libflate" ,rust-libflate-0.1) + (("rust-libflate" ,rust-libflate-1) ("rust-proc-macro-hack" ,rust-proc-macro-hack-0.5) - ("rust-proc-macro2" ,rust-proc-macro2-0.4) - ("rust-quote" ,rust-quote-0.6) - ("rust-syn" ,rust-syn-0.15)))) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)))) (home-page "https://github.com/SOF3/include-flate") (synopsis "Macro codegen for the @code{include-flate} crate") (description @@ -30103,17 +33569,17 @@ crate.") (define-public rust-include-flate-codegen-exports-0.1 (package (name "rust-include-flate-codegen-exports") - (version "0.1.3") + (version "0.1.4") (source (origin (method url-fetch) (uri (crate-uri "include-flate-codegen-exports" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0dk7xdrck9f3bjnwm3rmh5gl1hs64lr2gnd3dv3jznharcmyb4mw")))) + (base32 "00qswg7avv92mjp0p3kmswp3jask0psz1bmq3h7jin73zx1p0rbm")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t + `(#:skip-build? #t ; `#![feature]` may not be used on the stable release channel #:cargo-inputs (("rust-include-flate-codegen" ,rust-include-flate-codegen-0.1) ("rust-proc-macro-hack" ,rust-proc-macro-hack-0.5)))) @@ -30147,18 +33613,19 @@ that efficiently appends and removes common indentation after every newline.") (define-public rust-indexmap-2 (package (name "rust-indexmap") - (version "2.1.0") + (version "2.2.5") (source (origin (method url-fetch) (uri (crate-uri "indexmap" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "07rxrqmryr1xfnmhrjlz8ic6jw28v6h5cig3ws2c9d0wifhy2c6m")))) + "1x4x9zdqvlkfks3y84dsynh1p8na3nn48nn454s26rqla6fr42vv")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-arbitrary" ,rust-arbitrary-1) + ("rust-borsh" ,rust-borsh-1) ("rust-equivalent" ,rust-equivalent-1) ("rust-hashbrown" ,rust-hashbrown-0.14) ("rust-quickcheck" ,rust-quickcheck-1) @@ -30168,7 +33635,7 @@ that efficiently appends and removes common indentation after every newline.") #:cargo-development-inputs (("rust-fnv" ,rust-fnv-1) ("rust-fxhash" ,rust-fxhash-0.2) - ("rust-itertools" ,rust-itertools-0.11) + ("rust-itertools" ,rust-itertools-0.12) ("rust-lazy-static" ,rust-lazy-static-1) ("rust-quickcheck" ,rust-quickcheck-1) ("rust-rand" ,rust-rand-0.8) @@ -30292,8 +33759,49 @@ or numerical index. A corresponding hash set type is also provided.") of reference counted pointers.") (license license:expat))) +(define-public rust-indicatif-0.17 + (package + (name "rust-indicatif") + (version "0.17.8") + (source + (origin + (method url-fetch) + (uri (crate-uri "indicatif" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "18xyqxw9i5x4sbpzckhfz3nm984iq9r7nbi2lk76nz888n7mlfkn")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-test-flags + '("--release" "--" + "--skip=style::tests::wide_element_style") + #:cargo-inputs (("rust-console" ,rust-console-0.15) + ("rust-futures-core" ,rust-futures-core-0.3) + ("rust-instant" ,rust-instant-0.1) + ("rust-number-prefix" ,rust-number-prefix-0.4) + ("rust-portable-atomic" ,rust-portable-atomic-1) + ("rust-rayon" ,rust-rayon-1) + ("rust-tokio" ,rust-tokio-1) + ("rust-unicode-segmentation" ,rust-unicode-segmentation-1) + ("rust-unicode-width" ,rust-unicode-width-0.1) + ("rust-vt100" ,rust-vt100-0.15)) + #:cargo-development-inputs + (("rust-clap" ,rust-clap-4) + ("rust-futures" ,rust-futures-0.3) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-pretty-assertions" ,rust-pretty-assertions-1) + ("rust-rand" ,rust-rand-0.8) + ("rust-tokio" ,rust-tokio-1)))) + (home-page "https://github.com/console-rs/indicatif") + (synopsis "Progress bar and cli reporting library for Rust") + (description + "This package provides a progress bar and cli reporting library for +Rust.") + (license license:expat))) + (define-public rust-indicatif-0.16 (package + (inherit rust-indicatif-0.17) (name "rust-indicatif") (version "0.16.2") (source (origin @@ -30303,7 +33811,6 @@ of reference counted pointers.") (sha256 (base32 "06xyjs0kzqiqkjn60n1miwm2l87sa9p2lmzz0ymq18y72z37s81d")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-console" ,rust-console-0.15) @@ -30313,15 +33820,8 @@ of reference counted pointers.") ("rust-regex" ,rust-regex-1) ("rust-unicode-segmentation" ,rust-unicode-segmentation-1) ("rust-unicode-width" ,rust-unicode-width-0.1)) - #:cargo-development-inputs - (("rust-rand" ,rust-rand-0.8) - ("rust-tokio" ,rust-tokio-1)))) - (home-page "https://github.com/console-rs/indicatif") - (synopsis "Progress bar and cli reporting library for Rust") - (description - "This package provides a progress bar and cli reporting library for -Rust.") - (license license:expat))) + #:cargo-development-inputs (("rust-rand" ,rust-rand-0.8) + ("rust-tokio" ,rust-tokio-1)))))) (define-public rust-indicatif-0.15 (package @@ -30462,6 +33962,59 @@ package. It is obsolete for indoc versions > 1."))) signature.") (license license:expat))) +(define-public rust-inferno-0.11 + (package + (name "rust-inferno") + (version "0.11.19") + (source + (origin + (method url-fetch) + (uri (crate-uri "inferno" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1ndqcz0p6n4gqrqlq53j42v516nnnii0ljshx634cjnlkj1hy7rj")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-test-flags + '("--release" "--" + "--skip=collapse::dtrace::tests::test_collapse_multi_dtrace" + "--skip=collapse::dtrace::tests::test_collapse_multi_dtrace_simple" + "--skip=collapse::perf::tests::test_collapse_multi_perf" + "--skip=collapse::perf::tests::test_collapse_multi_perf_simple" + "--skip=collapse::perf::tests::test_multiple_skip_after" + "--skip=collapse::perf::tests::test_one_skip_after") + #:cargo-inputs (("rust-ahash" ,rust-ahash-0.8) + ("rust-clap" ,rust-clap-4) + ("rust-crossbeam-channel" ,rust-crossbeam-channel-0.5) + ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.8) + ("rust-dashmap" ,rust-dashmap-5) + ("rust-env-logger" ,rust-env-logger-0.10) + ("rust-indexmap" ,rust-indexmap-2) + ("rust-is-terminal" ,rust-is-terminal-0.4) + ("rust-itoa" ,rust-itoa-1) + ("rust-log" ,rust-log-0.4) + ("rust-num-format" ,rust-num-format-0.4) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-quick-xml" ,rust-quick-xml-0.26) + ("rust-rgb" ,rust-rgb-0.8) + ("rust-str-stack" ,rust-str-stack-0.1)) + #:cargo-development-inputs + (("rust-assert-cmd" ,rust-assert-cmd-2) + ("rust-criterion" ,rust-criterion-0.4) + ("rust-libflate" ,rust-libflate-2) + ("rust-maplit" ,rust-maplit-1) + ("rust-pretty-assertions" ,rust-pretty-assertions-1) + ("rust-rand" ,rust-rand-0.8) + ("rust-regex" ,rust-regex-1) + ("rust-serde" ,rust-serde-1) + ("rust-testing-logger" ,rust-testing-logger-0.1)))) + (home-page "https://github.com/jonhoo/inferno") + (synopsis "Rust port of the FlameGraph performance profiling tools") + (description + "@code{inferno} is a Rust port of the @code{FlameGraph} performance +profiling tool suite.") + (license license:cddl1.0))) + (define-public rust-inflate-0.4 (package (name "rust-inflate") @@ -30529,6 +34082,31 @@ deordinalize, demodulize, foreign key, and pluralize/singularize are supported as both traits and pure functions acting on String types.") (license license:bsd-2))) +(define-public rust-inlinable-string-0.1 + (package + (name "rust-inlinable-string") + (version "0.1.15") + (source + (origin + (method url-fetch) + (uri (crate-uri "inlinable_string" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1ysjci8yfvxgf51z0ny2nnwhxrclhmb3vbngin8v4bznhr3ybyn8")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-serde" ,rust-serde-1)) + #:cargo-development-inputs (("rust-serde-test" ,rust-serde-test-1)))) + (home-page "https://github.com/fitzgen/inlinable_string") + (synopsis "Crate which provides the `InlinableString` type") + (description + "The @code{inlinable_string} crate provides the @code{InlinableString} type +-- an owned, grow-able UTF-8 string that stores small strings inline and avoids +heap-allocation -- and the @code{StringExt} trait which abstracts string +operations over both @code{std::string::String} and @code{InlinableString} (or +even your own custom string type).") + (license (list license:asl2.0 license:expat)))) + (define-public rust-inline-c-0.1 (package (name "rust-inline-c") @@ -30951,21 +34529,22 @@ that works on WASM too.") (define-public rust-integer-encoding-3 (package (name "rust-integer-encoding") - (version "3.0.2") + (version "3.0.4") (source (origin (method url-fetch) (uri (crate-uri "integer-encoding" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1f0mk7d694g2sz4my5zh7i5w4kijx5y16x6dip7fv0pazx013hch")))) + (base32 "00ng7jmv6pqwqc8w1297f768bn0spwwicdr7hb40baax00r3gc4b")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-async-trait" ,rust-async-trait-0.1) ("rust-futures-util" ,rust-futures-util-0.3) - ("rust-tokio" ,rust-tokio-1)))) + ("rust-tokio" ,rust-tokio-1)) + #:cargo-development-inputs (("rust-bencher" ,rust-bencher-0.1) + ("rust-tokio" ,rust-tokio-1)))) (home-page "https://github.com/dermesser/integer-encoding-rs") (synopsis "Encoding and decoding integers to and from bytestrings") (description @@ -30977,20 +34556,20 @@ bytestring representations.") (package (inherit rust-integer-encoding-3) (name "rust-integer-encoding") - (version "1.2.2") + (version "1.1.7") (source (origin (method url-fetch) (uri (crate-uri "integer-encoding" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1c032xhif5d6a8nc4cak60g5ylwd6p9569122m5hm67brx2l5yhb")))) + (base32 "0vxmsfxwsf8dclppdmikjklzh84w341crl0lb3bpydwv18c53p28")))) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-async-trait" ,rust-async-trait-0.1) ("rust-futures-util" ,rust-futures-util-0.3) - ("rust-tokio" ,rust-tokio-0.2)))))) + ("rust-tokio" ,rust-tokio-0.2)) + #:cargo-development-inputs (("rust-tokio" ,rust-tokio-0.2)))))) (define-public rust-interpolate-name-0.2 (package @@ -31015,6 +34594,23 @@ bytestring representations.") "Simple procedural macro attribute for repetitive tests.") (license license:expat))) +(define-public rust-invalidstring-0.1 + (package + (name "rust-invalidstring") + (version "0.1.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "invalidstring" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0vxin67ybys7ihmwr5xvvwqv3q7lcn2pxg1skw14xr8kjpa0z5nj")))) + (build-system cargo-build-system) + (home-page "https://github.com/extrawurst/gitui") + (synopsis "Invalid string data for testing") + (description "This crate is just for testing invalid string data.") + (license license:expat))) + (define-public rust-inventory-0.3 (package (name "rust-inventory") @@ -31131,6 +34727,32 @@ versions < 0.2.") @code{BufWriter}.") (license (list license:expat license:asl2.0)))) +(define-public rust-io-extras-0.18 + (package + (name "rust-io-extras") + (version "0.18.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "io-extras" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1vfi3dm8667naalicaaq1lqp8pvnjp805x5903k2k2hfp4zyf0f3")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-async-std" ,rust-async-std-1) + ("rust-io-lifetimes" ,rust-io-lifetimes-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.52)) + #:cargo-development-inputs (("rust-os-pipe" ,rust-os-pipe-1)))) + (home-page "https://github.com/sunfishcode/io-extras") + (synopsis "File/socket handle/descriptor utilities") + (description "File/socket handle/descriptor utilities.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-io-lifetimes-2 (package (name "rust-io-lifetimes") @@ -31231,6 +34853,30 @@ library.") (description "The low-level `io_uring` userspace interface for Rust.") (license (list license:expat license:asl2.0)))) +(define-public rust-ioslice-0.6 + (package + (name "rust-ioslice") + (version "0.6.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "ioslice" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "06z38yklsxn53ypslljk21cj25py7wbyagifs5s91f53r1916msy")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2) + ("rust-stable-deref-trait" ,rust-stable-deref-trait-1) + ("rust-winapi" ,rust-winapi-0.3)) + #:cargo-development-inputs (("rust-libc" ,rust-libc-0.2)))) + (home-page "https://github.com/4lDO2/ioslice-rs") + (synopsis "@code{no_std} I/O slices compatible with @code{std} and @code{lbc}") + (description + "This package provides @code{no_std} I/O slices that are still optionally +ABI compatible with @code{std} and @code{lbc}.") + (license license:expat))) + (define-public rust-iovec-0.1 (package (name "rust-iovec") @@ -31272,21 +34918,22 @@ library.") #:cargo-development-inputs (("rust-serde-test" ,rust-serde-test-1)))) (home-page "https://github.com/lo48576/iri-string") (synopsis "IRI as string types") - (description "String types for @acronym{IRIs, Internationalized Resource -Identifiers} and @acronym{URIs, Uniform Resource Identifiers}.") + (description + "This package provides string types for @acronym{IRIs, Internationalized +Resource Identifiers} and @acronym{URIs, Uniform Resource Identifiers}.") (license (list license:expat license:asl2.0)))) (define-public rust-is-ci-1 (package (name "rust-is-ci") - (version "1.1.1") + (version "1.2.0") (source (origin (method url-fetch) (uri (crate-uri "is_ci" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1ywra2z56x6d4pc02zq24a4x7gvpixynh9524icbpchbf9ydwv31")))) + "0ifwvxmrsj4r29agfzr71bjq6y1bihkx38fbzafq5vl0jn1wjmbn")))) (build-system cargo-build-system) (home-page "https://github.com/zkat/is_ci") (synopsis "Lightweight CI environment checker") @@ -31452,6 +35099,26 @@ Rust.") (description "get build model is debug") (license (list license:expat license:asl2.0)))) +(define-public rust-is-docker-0.2 + (package + (name "rust-is-docker") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "is-docker" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1cyibrv6817cqcpf391m327ss40xlbik8wxcv5h9pj9byhksx2wj")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-once-cell" ,rust-once-cell-1)))) + (home-page "https://github.com/TheLarkInn/is-docker") + (synopsis "Checks if the process is running inside a Docker container") + (description "This package provides a helper function to check if the +process is running inside a Docker container.") + (license license:expat))) + (define-public rust-is-executable-1 (package (name "rust-is-executable") @@ -31505,25 +35172,69 @@ whether or not a given path points to an executable file.") stream runs in a TTY.") (license license:expat))) -(define-public rust-iso8601-0.4 +(define-public rust-is-wsl-0.4 + (package + (name "rust-is-wsl") + (version "0.4.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "is-wsl" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "19bs5pq221d4bknnwiqqkqrnsx2in0fsk8fylxm1747iim4hjdhp")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-is-docker" ,rust-is-docker-0.2) + ("rust-once-cell" ,rust-once-cell-1)))) + (home-page "https://github.com/TheLarkInn/is-wsl") + (synopsis + "Checks if the process is running inside Windows Subsystem for Linux") + (description + "This package provides functions to check if the process is running inside +Windows Subsystem for Linux.") + (license license:expat))) + +(define-public rust-iso8601-0.6 (package (name "rust-iso8601") - (version "0.4.2") + (version "0.6.1") (source (origin (method url-fetch) (uri (crate-uri "iso8601" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "15nfg6d4qlniw4gk7039s5y07lzgr1dp9snsw63lsxarnyz4zfg5")))) + (base32 "0lqif1zp19fjmrbhcdjx0ydnljax3090san5zq8r1x98x9rmsklj")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs (("rust-nom" ,rust-nom-7)))) + `(#:cargo-inputs + (("rust-chrono" ,rust-chrono-0.4) + ("rust-nom" ,rust-nom-7) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-serde" ,rust-serde-1)) + #:cargo-development-inputs + (("rust-serde-json" ,rust-serde-json-1)))) (home-page "https://github.com/badboy/iso8601") - (synopsis "Parsing ISO8601 dates using nom") - (description "Parsing ISO8601 dates using nom.") + (synopsis "Parsing ISO8601 dates using @code{nom}") + (description "This crate parses ISO8601 dates using @code{nom}.") (license license:expat))) +(define-public rust-iso8601-0.4 + (package + (inherit rust-iso8601-0.6) + (name "rust-iso8601") + (version "0.4.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "iso8601" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "15nfg6d4qlniw4gk7039s5y07lzgr1dp9snsw63lsxarnyz4zfg5")))) + (arguments + `(#:cargo-inputs (("rust-nom" ,rust-nom-7)))))) + (define-public rust-iso8601-0.3 (package (inherit rust-iso8601-0.4) @@ -31570,14 +35281,14 @@ language codes.") (define-public rust-itertools-0.12 (package (name "rust-itertools") - (version "0.12.0") + (version "0.12.1") (source (origin (method url-fetch) (uri (crate-uri "itertools" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1c07gzdlc6a1c8p8jrvvw3gs52bss3y58cs2s21d9i978l36pnr5")))) + (base32 "0s95jbb3ndj1lvfxyq5wanc0fm0r6hg6q4ngb92qlfdxvci10ads")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-either" ,rust-either-1)) @@ -31764,14 +35475,14 @@ and functions.") (define-public rust-itoa-1 (package (name "rust-itoa") - (version "1.0.6") + (version "1.0.11") (source (origin (method url-fetch) (uri (crate-uri "itoa" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "19jc2sa3wvdc29zhgbwf3bayikq4rq18n20dbyg9ahd4hbsxjfj5")))) + (base32 "0nv9cqjwzr3q58qz84dcz63ggc54yhf1yqar1m858m1kfd4g3wa9")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-no-panic" ,rust-no-panic-0.1)))) @@ -32456,7 +36167,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.27") + (version "0.1.28") (source (origin (method url-fetch) @@ -32464,7 +36175,7 @@ the jni-bindgen code generator for binding to JVM APIs from Rust.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0z9w6vfqwbr6hfk9yaw7kydlh6f7k39xdlszxlh39in4acwzcdwc")))) + "1mji1wis4w76v3issgpah2x3j1k0ybq0cz3qgypg7pkdablscimb")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -32481,6 +36192,29 @@ the jni-bindgen code generator for binding to JVM APIs from Rust.") "An implementation of the GNU make jobserver for Rust.") (license (list license:expat license:asl2.0)))) +(define-public rust-joinery-2 + (package + (name "rust-joinery") + (version "2.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "joinery" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1xg4cjnz8cd6ya9hynb9wx79ijd3j6307f47aijviqzwyml7s5kj")))) + (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/Lucretiel/joinery") + (synopsis + "Crate for generically joining iterators with a separator") + (description "This package provides a small crate for generically joining +iterators with a separator.") + (license license:expat))) + (define-public rust-jsonpath-lib-0.3 (package (name "rust-jsonpath-lib") @@ -32583,6 +36317,27 @@ wasm-bindgen crate.") friction with idiomatic Rust structs to ease interopability.") (license (list license:expat license:asl2.0)))) +(define-public rust-json-deserializer-0.4 + (package + (name "rust-json-deserializer") + (version "0.4.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "json-deserializer" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0gv8qa9bprcw0ypz4kmpp844yfjg1dpzayk7xc5i1d3fw4hv8qsz")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t ; Cut the dependency graph. + #:cargo-inputs (("rust-indexmap" ,rust-indexmap-1)))) + (home-page "https://github.com/jorgecarleitao/json-deserializer") + (synopsis "Performant library to deserialize JSON") + (description + "This package provides a performant library to deserialize JSON.") + (license license:asl2.0))) + (define-public rust-juliex-0.3 (package (name "rust-juliex") @@ -32613,26 +36368,30 @@ allocation per spawned future, whereas the futures Threadpool uses std concurrency primitives and multiple allocations.") (license (list license:expat license:asl2.0)))) -(define-public rust-juniper-codegen-0.14 +(define-public rust-juniper-codegen-0.15 (package (name "rust-juniper-codegen") - (version "0.14.2") + (version "0.15.9") (source (origin (method url-fetch) (uri (crate-uri "juniper_codegen" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "06ym8568k9p75kvnfc4ywqbkzaa4ib6gngx9vpbsjwg9v0sg42nl")))) + (base32 "1nvigsc1yrfv09wx1yv830dd60ay556haz87p80h7m8s0rqpdsdf")))) (build-system cargo-build-system) (arguments - `(#:tests? #false ;FIXME: fail due to unresolved import + ;; XXX: Tests fail with "error[E0599]: no variant or associated item + ;; named `__TestExhaustive` found for enum `syn::Type` in the current + ;; scope". + `(#:tests? #false #:cargo-inputs - (("rust-proc-macro2" ,rust-proc-macro2-1) + (("rust-proc-macro-error" ,rust-proc-macro-error-1) + ("rust-proc-macro2" ,rust-proc-macro2-1) ("rust-quote" ,rust-quote-1) ("rust-syn" ,rust-syn-1)) #:cargo-development-inputs - (("rust-juniper" ,rust-juniper-0.14)))) + (("rust-juniper" ,rust-juniper-0.15)))) (home-page "https://github.com/graphql-rust/juniper") (synopsis "Internal custom derive trait for Juniper GraphQL") (description @@ -32640,32 +36399,63 @@ concurrency primitives and multiple allocations.") GraphQL.") (license license:bsd-2))) -(define-public rust-juniper-0.14 +(define-public rust-juniper-codegen-0.14 (package - (name "rust-juniper") + (inherit rust-juniper-codegen-0.15) + (name "rust-juniper-codegen") (version "0.14.2") (source (origin (method url-fetch) + (uri (crate-uri "juniper_codegen" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "06ym8568k9p75kvnfc4ywqbkzaa4ib6gngx9vpbsjwg9v0sg42nl")))) + (arguments + `(#:tests? #false ;FIXME: fail due to unresolved import + #:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)) + #:cargo-development-inputs + (("rust-juniper" ,rust-juniper-0.14)))))) + +(define-public rust-juniper-0.15 + (package + (name "rust-juniper") + (version "0.15.12") + (source + (origin + (method url-fetch) (uri (crate-uri "juniper" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0s56rb31yddhvjynl5bk8jihcdln8h5yfsx63kfxdhzvw98vlqpn")))) + (base32 "1dg1b5msr8k4kwmam2h0f64z7aamk4799vdh3cg55c881idclpc7")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-chrono" ,rust-chrono-0.4) + (("rust-anyhow" ,rust-anyhow-1) + ("rust-async-trait" ,rust-async-trait-0.1) + ("rust-bson" ,rust-bson-1) + ("rust-chrono" ,rust-chrono-0.4) + ("rust-chrono-tz" ,rust-chrono-tz-0.5) ("rust-fnv" ,rust-fnv-1) + ("rust-futures" ,rust-futures-0.3) + ("rust-futures-enum" ,rust-futures-enum-0.1) + ("rust-graphql-parser" ,rust-graphql-parser-0.3) ("rust-indexmap" ,rust-indexmap-1) - ("rust-juniper-codegen" ,rust-juniper-codegen-0.14) + ("rust-juniper-codegen" ,rust-juniper-codegen-0.15) ("rust-serde" ,rust-serde-1) - ("rust-serde-derive" ,rust-serde-derive-1) ("rust-serde-json" ,rust-serde-json-1) + ("rust-smartstring" ,rust-smartstring-1) + ("rust-static-assertions" ,rust-static-assertions-1) ("rust-url" ,rust-url-2) - ("rust-uuid" ,rust-uuid-0.7)) + ("rust-uuid" ,rust-uuid-0.8)) #:cargo-development-inputs (("rust-bencher" ,rust-bencher-0.1) - ("rust-serde-json" ,rust-serde-json-1)))) + ("rust-pretty-assertions" ,rust-pretty-assertions-0.7) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-tokio" ,rust-tokio-1)))) (home-page "https://github.com/graphql-rust/juniper") (synopsis "GraphQL server library for Rust") (description @@ -32680,6 +36470,33 @@ frameworks, including embedded Graphiql and GraphQL Playground for easy debugging.") (license license:bsd-2))) +(define-public rust-juniper-0.14 + (package + (inherit rust-juniper-0.15) + (name "rust-juniper") + (version "0.14.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "juniper" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0s56rb31yddhvjynl5bk8jihcdln8h5yfsx63kfxdhzvw98vlqpn")))) + (arguments + `(#:cargo-inputs + (("rust-chrono" ,rust-chrono-0.4) + ("rust-fnv" ,rust-fnv-1) + ("rust-indexmap" ,rust-indexmap-1) + ("rust-juniper-codegen" ,rust-juniper-codegen-0.14) + ("rust-serde" ,rust-serde-1) + ("rust-serde-derive" ,rust-serde-derive-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-url" ,rust-url-2) + ("rust-uuid" ,rust-uuid-0.7)) + #:cargo-development-inputs + (("rust-bencher" ,rust-bencher-0.1) + ("rust-serde-json" ,rust-serde-json-1)))))) + (define-public rust-keccak-0.1 (package (name "rust-keccak") @@ -32848,8 +36665,47 @@ passwords/credentials.") "This package provides a Log macro for log's kv-unstable backend.") (license (list license:expat license:asl2.0)))) +(define-public rust-k9-0.12 + (package + (name "rust-k9") + (version "0.12.0") + (source (origin + (method url-fetch) + (uri (crate-uri "k9" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "056ngrvyla95qj737h7xjw5ja697h07mpw6pci5v3cb8bfxwx2q8")) + (snippet + #~(begin (use-modules (guix build utils)) + (substitute* "Cargo.toml" + ;; k9@0.11.7 was yanked by upstream, provide 0.11.6. + (("0\\.11\\.7") "0.11.6")))))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-anyhow" ,rust-anyhow-1) + ("rust-colored" ,rust-colored-2) + ("rust-diff" ,rust-diff-0.1) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-regex" ,rust-regex-1) + ("rust-syn" ,rust-syn-2) + ("rust-terminal-size" ,rust-terminal-size-0.2)) + #:cargo-development-inputs + (("rust-derive-builder" ,rust-derive-builder-0.9) + ("rust-k9" ,rust-k9-0.11) + ("rust-rand" ,rust-rand-0.7) + ("rust-sha2" ,rust-sha2-0.9) + ("rust-strip-ansi-escapes" ,rust-strip-ansi-escapes-0.1)))) + (home-page "https://github.com/aaronabramov/k9") + (synopsis "Testing library") + (description "This package contains helper macros for writing unit tests.") + (license license:expat))) + (define-public rust-k9-0.11 (package + (inherit rust-k9-0.12) (name "rust-k9") (version "0.11.6") (source (origin @@ -32859,7 +36715,6 @@ passwords/credentials.") (sha256 (base32 "1a8pxz6fygqzknxdlb4l835kqxgjk7snm4bjhhhn783r025vbp9j")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-anyhow" ,rust-anyhow-1) @@ -32870,12 +36725,7 @@ passwords/credentials.") ("rust-proc-macro2" ,rust-proc-macro2-1) ("rust-regex" ,rust-regex-1) ("rust-syn" ,rust-syn-1) - ("rust-term-size" ,rust-term-size-0.3)))) - (home-page "https://github.com/aaronabramov/k9") - (synopsis "Testing library") - (description - "This package contains helper macros for writing unit tests.") - (license license:expat))) + ("rust-term-size" ,rust-term-size-0.3)))))) (define-public rust-language-tags-0.3 (package @@ -32953,8 +36803,45 @@ language tags.") space, and comparing differences in color.") (license license:expat))) +(define-public rust-lalrpop-0.20 + (package + (name "rust-lalrpop") + (version "0.20.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "lalrpop" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1jn1qg7gs9kka6sy2sbxx8wp6z8lm892ksr414b9yaansrx0gjsm")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-ascii-canvas" ,rust-ascii-canvas-3) + ("rust-bit-set" ,rust-bit-set-0.5) + ("rust-ena" ,rust-ena-0.14) + ("rust-itertools" ,rust-itertools-0.11) + ("rust-lalrpop-util" ,rust-lalrpop-util-0.20) + ("rust-petgraph" ,rust-petgraph-0.6) + ("rust-pico-args" ,rust-pico-args-0.5) + ("rust-regex" ,rust-regex-1) + ("rust-regex-syntax" ,rust-regex-syntax-0.8) + ("rust-string-cache" ,rust-string-cache-0.8) + ("rust-term" ,rust-term-0.7) + ("rust-tiny-keccak" ,rust-tiny-keccak-2) + ("rust-unicode-xid" ,rust-unicode-xid-0.2) + ("rust-walkdir" ,rust-walkdir-2)) + #:cargo-development-inputs (("rust-diff" ,rust-diff-0.1) + ("rust-rand" ,rust-rand-0.8)))) + (home-page "https://github.com/lalrpop/lalrpop") + (synopsis "Convenient LR(1) parser generator for Rust") + (description "LALRPOP is a Rust parser generator framework with usability +as its primary goal. You should be able to write compact, DRY, readable +grammars.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-lalrpop-0.19 (package + (inherit rust-lalrpop-0.20) (name "rust-lalrpop") (version "0.19.1") (source @@ -32964,7 +36851,6 @@ space, and comparing differences in color.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "1j52sybjhn82ydgsmnw7nkywjyb7pvg50mvyb48m7vdq3wcmdyv0")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs @@ -32985,14 +36871,7 @@ space, and comparing differences in color.") ("rust-string-cache" ,rust-string-cache-0.8) ("rust-term" ,rust-term-0.5) ("rust-unicode-xid" ,rust-unicode-xid-0.2)) - #:cargo-development-inputs - (("rust-rand" ,rust-rand-0.7)))) - (home-page "https://github.com/lalrpop/lalrpop") - (synopsis "Convenient LR(1) parser generator for Rust") - (description "LALRPOP is a Rust parser generator framework with usability -as its primary goal. You should be able to write compact, DRY, readable -grammars.") - (license (list license:asl2.0 license:expat)))) + #:cargo-development-inputs (("rust-rand" ,rust-rand-0.7)))))) (define-public rust-lalrpop-0.17 (package @@ -33029,8 +36908,29 @@ grammars.") #:cargo-development-inputs (("rust-rand" ,rust-rand-0.6)))))) +(define-public rust-lalrpop-util-0.20 + (package + (name "rust-lalrpop-util") + (version "0.20.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "lalrpop-util" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0lr5r12bh9gjjlmnjrbblf4bfcwnad4gz1hqjvp34yzb22ln0x2h")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-regex-automata" ,rust-regex-automata-0.4)))) + (home-page "https://github.com/lalrpop/lalrpop") + (synopsis "Runtime library for parsers generated by LALRPOP") + (description "THis package provides the runtime library for parsers +generated by LALRPOP.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-lalrpop-util-0.19 (package + (inherit rust-lalrpop-util-0.20) (name "rust-lalrpop-util") (version "0.19.1") (source @@ -33040,16 +36940,9 @@ grammars.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "0224r8gsbk8and96nhwgzdj4hc1c01g78zmvv3x4f5jnzwg1cwb7")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t - #:cargo-inputs - (("rust-regex" ,rust-regex-1)))) - (home-page "https://github.com/lalrpop/lalrpop") - (synopsis "Runtime library for parsers generated by LALRPOP") - (description "THis package provides the runtime library for parsers -generated by LALRPOP.") - (license (list license:asl2.0 license:expat)))) + #:cargo-inputs (("rust-regex" ,rust-regex-1)))))) (define-public rust-lalrpop-util-0.17 (package @@ -33131,6 +37024,52 @@ generated by LALRPOP.") "This crate provides simple methods to cast from and into byte arrays.") (license license:boost1.0))) +(define-public rust-lazy-regex-3 + (package + (name "rust-lazy-regex") + (version "3.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "lazy-regex" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0k3sjdcr13j119kgz1h7f1k2mnl787ig9ag436ymipxgjm2vw4jx")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-lazy-regex-proc-macros" ,rust-lazy-regex-proc-macros-3) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-regex" ,rust-regex-1) + ("rust-regex-lite" ,rust-regex-lite-0.1)))) + (home-page "https://github.com/Canop/lazy-regex") + (synopsis "Lazy static regular expressions checked at compile time") + (description "Lazy static regular expressions checked at compile time.") + (license license:expat))) + +(define-public rust-lazy-regex-proc-macros-3 + (package + (name "rust-lazy-regex-proc-macros") + (version "3.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "lazy-regex-proc_macros" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "02zgaxdq95s0xm4svbdz6f4xkf4kncl5gjfdzyxgr9wpdj7dbg24")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; cannot find macro `regex_replace_all` in this scope + #:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-regex" ,rust-regex-1) + ("rust-syn" ,rust-syn-2)))) + (home-page "https://github.com/Canop/lazy-regex") + (synopsis "Proc macros for the lazy_regex crate") + (description "This package provides proc macros for the lazy_regex crate.") + (license license:expat))) + (define-public rust-lazy-static-1 (package (name "rust-lazy-static") @@ -33241,6 +37180,28 @@ requires non-const function calls to be computed.") (description "Read the ELF dependency tree.") (license license:expat))) +(define-public rust-leb128-0.2 + (package + (name "rust-leb128") + (version "0.2.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "leb128" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0rxxjdn76sjbrb08s4bi7m4x47zg68f71jzgx8ww7j0cnivjckl8")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-development-inputs (("rust-quickcheck" ,rust-quickcheck-0.8)))) + (home-page "https://github.com/gimli-rs/leb128") + (synopsis + "Read and write DWARF LEB128 variable length integer encoding") + (description + "Read and write DWARF's @code{Little Endian Base 128} (LEB128) variable +length integer encoding.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-lebe-0.5 (package (name "rust-lebe") @@ -33294,6 +37255,39 @@ requires non-const function calls to be computed.") sending emails from Rust applications.") (license license:expat))) +(define-public rust-lettre-email-0.9 + (package + (name "rust-lettre-email") + (version "0.9.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "lettre_email" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1mar4njchjd33q7s47r43njjj8farkb78f8ica77jj6gil7lh0px")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-test-flags + '("--release" "--" "--skip=book_test") + #:cargo-inputs + (("rust-base64" ,rust-base64-0.10) + ("rust-email" ,rust-email-0.0.20) + ("rust-lettre" ,rust-lettre-0.9) + ("rust-mime" ,rust-mime-0.3) + ("rust-time" ,rust-time-0.1) + ("rust-uuid" ,rust-uuid-0.7)) + #:cargo-development-inputs (("rust-glob" ,rust-glob-0.3) + ("rust-lettre" ,rust-lettre-0.9)))) + (native-inputs (list pkg-config)) + (inputs (list openssl)) + (home-page "https://github.com/lettre/lettre") + (synopsis "Mailer library for Rust") + (description "Lettre is a mailer library for Rust. It provides multiple +transport methods, unicode support, secure delivery with SMTP using encryption +and authentication, easy email builders, and async support.") + (license license:expat))) + (define-public rust-levenshtein-1 (package (name "rust-levenshtein") @@ -33601,14 +37595,14 @@ parser in Rust.") (define-public rust-libc-0.2 (package (name "rust-libc") - (version "0.2.151") + (version "0.2.153") (source (origin (method url-fetch) (uri (crate-uri "libc" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1x28f0zgp4zcwr891p8n9ag9w371sbib30vp4y6hi2052frplb9h")))) + (base32 "1gg7m1ils5dms5miq9fyllrcp0jxnbpgkx71chd2i0lafa8qy6cw")))) (build-system cargo-build-system) (arguments (list #:cargo-inputs @@ -33627,19 +37621,6 @@ values of all the exported APIs match the platform that libc is compiled for.") (license (list license:expat license:asl2.0)))) -(define-public rust-libc-0.2.153 - (package - (inherit rust-libc-0.2) - (name "rust-libc") - (version "0.2.153") - (source - (origin - (method url-fetch) - (uri (crate-uri "libc" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 "1gg7m1ils5dms5miq9fyllrcp0jxnbpgkx71chd2i0lafa8qy6cw")))))) - (define-public rust-libc-print-0.1 (package (name "rust-libc-print") @@ -33776,31 +37757,52 @@ for raw deflate, zlib, and gzip data.") (("rust-criterion" ,rust-criterion-0.3) ("rust-flate2" ,rust-flate2-1)))))) -(define-public rust-libflate-1 +(define-public rust-libflate-2 (package (name "rust-libflate") - (version "1.1.1") + (version "2.0.0") (source (origin (method url-fetch) (uri (crate-uri "libflate" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "07hlzg1zly4dw9s39fv2ik6nfcjpjgx82b5kkf3bafdvdvvlldhn")))) + (base32 "1gxjqgbzzn6sdalrd2cfn7zb14c75if3dx3nzz3sz58pmra5czcz")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs - (("rust-adler32" ,rust-adler32-1) - ("rust-crc32fast" ,rust-crc32fast-1) - ("rust-libflate-lz77" ,rust-libflate-lz77-1)) - #:cargo-development-inputs - (("rust-clap" ,rust-clap-2)))) + `(#:cargo-inputs (("rust-adler32" ,rust-adler32-1) + ("rust-core2" ,rust-core2-0.4) + ("rust-crc32fast" ,rust-crc32fast-1) + ("rust-dary-heap" ,rust-dary-heap-0.3) + ("rust-libflate-lz77" ,rust-libflate-lz77-2)) + #:cargo-development-inputs (("rust-clap" ,rust-clap-2)))) (home-page "https://github.com/sile/libflate") (synopsis "DEFLATE algorithm and related formats (ZLIB, GZIP)") (description "This package provides a Rust implementation of DEFLATE algorithm and related formats (ZLIB, GZIP).") (license license:expat))) +(define-public rust-libflate-1 + (package + (inherit rust-libflate-2) + (name "rust-libflate") + (version "1.4.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "libflate" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "063xw2z477h3vh7j32y0f54a6nbndd7yf7rr5wpsvfw5nrqsxx2z")))) + (arguments + `(#:cargo-inputs + (("rust-adler32" ,rust-adler32-1) + ("rust-core2" ,rust-core2-0.4) + ("rust-crc32fast" ,rust-crc32fast-1) + ("rust-libflate-lz77" ,rust-libflate-lz77-1)) + #:cargo-development-inputs + (("rust-clap" ,rust-clap-2)))))) + (define-public rust-libflate-0.1 (package (inherit rust-libflate-1) @@ -33824,8 +37826,32 @@ algorithm and related formats (ZLIB, GZIP).") #:cargo-development-inputs (("rust-clap" ,rust-clap-2)))))) +(define-public rust-libflate-lz77-2 + (package + (name "rust-libflate-lz77") + (version "2.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "libflate_lz77" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "096map4a8xvf3819kgdxbg08nf97nggg9lvrdgn7c5a5ikxm4pxy")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; unresolved import `libflate` + #:cargo-inputs + (("rust-core2" ,rust-core2-0.4) + ("rust-hashbrown" ,rust-hashbrown-0.13) + ("rust-rle-decode-fast" ,rust-rle-decode-fast-1)))) + (home-page "https://github.com/sile/libflate") + (synopsis "LZ77 encoder for libflate crate") + (description "This package provides a LZ77 encoder for libflate crate.") + (license license:expat))) + (define-public rust-libflate-lz77-1 (package + (inherit rust-libflate-lz77-2) (name "rust-libflate-lz77") (version "1.2.0") (source @@ -33835,18 +37861,13 @@ algorithm and related formats (ZLIB, GZIP).") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "1gxc75fb2sk0xgrh3qxvxcx1l93yhmyxn9241r251wl5zj5klbd5")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-core2" ,rust-core2-0.4) ("rust-hashbrown" ,rust-hashbrown-0.13) ("rust-rle-decode-fast" ,rust-rle-decode-fast-1)) #:cargo-development-inputs - (("rust-libflate" ,rust-libflate-1)))) - (home-page "https://github.com/sile/libflate") - (synopsis "LZ77 encoder for libflate crate") - (description "This package provides a LZ77 encoder for libflate crate.") - (license license:expat))) + (("rust-libflate" ,rust-libflate-1)))))) (define-public rust-libfuzzer-sys-0.4 (package @@ -34005,25 +38026,22 @@ functions and static variables these libraries contain.") (define-public rust-libm-0.2 (package (name "rust-libm") - (version "0.2.6") + (version "0.2.8") (source (origin (method url-fetch) (uri (crate-uri "libm" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "1ywg7jfcgfv4jypxi3f6rpf7n9509ky695bfzy1fqhms7ymhi09l")))) + (base32 "0n4hk1rs8pzw8hdfmwn96c4568s93kfxqgcqswr7sajd2diaihjf")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs - (("rust-rand" ,rust-rand-0.6)) - #:cargo-development-inputs - (("rust-no-panic" ,rust-no-panic-0.1)))) + `(#:cargo-inputs (("rust-rand" ,rust-rand-0.6)) + #:cargo-development-inputs (("rust-no-panic" ,rust-no-panic-0.1)))) (home-page "https://github.com/rust-lang/libm") (synopsis "Libm in pure Rust") - (description "This package provides an implementation of libm in pure Rust.") + (description + "This package provides an implementation of libm in pure Rust.") (license (list license:expat license:asl2.0)))) (define-public rust-libm-0.1 @@ -34088,6 +38106,25 @@ functions and static variables these libraries contain.") information.") (license license:expat))) +(define-public rust-libmath-0.2 + (package + (name "rust-libmath") + (version "0.2.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "libmath" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "00j546nfjsd4i1z1di800crazjyz6bv0dc63sn0awlx86ill3lyz")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-rand" ,rust-rand-0.3)))) + (home-page "https://github.com/scoobadog/libmath-rs") + (synopsis "Mathematical utilities") + (description "This package provides some mathematical utilities.") + (license license:expat))) + (define-public rust-libmimalloc-sys-0.1 (package (name "rust-libmimalloc-sys") @@ -34224,6 +38261,33 @@ advertised and discovered using this mechanism.") (license (list license:asl2.0 license:expat)))) +(define-public rust-libproc-0.14 + (package + (name "rust-libproc") + (version "0.14.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "libproc" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0va3jzmgfj57lf0zfq59acfkid3frs6nvx9xlsnc5jd4g1q4kdlf")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-bindgen" ,rust-bindgen-0.69) + ("rust-errno" ,rust-errno-0.3) + ("rust-libc" ,rust-libc-0.2)) + #:cargo-development-inputs + (("rust-procfs" ,rust-procfs-0.16) + ("rust-tempfile" ,rust-tempfile-3)))) + (home-page "https://github.com/andrewdavidmackenzie/libproc-rs") + (synopsis "Library to get information about running processes") + (description + "This package provides a library to get information about running +processes for both MacOS and Linux.") + (license license:expat))) + (define-public rust-libpulse-binding-2 (package (name "rust-libpulse-binding") @@ -34396,27 +38460,45 @@ suite of tools for the rapid, accurate and memory-frugal processing single-cell and single-nucleus sequencing data.") (license license:bsd-3))) -(define-public rust-libredox-0.0.2 +(define-public rust-libredox-0.1 (package (name "rust-libredox") - (version "0.0.2") + (version "0.1.3") (source (origin (method url-fetch) (uri (crate-uri "libredox" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "01v6pb09j7dl2gnbvzz6zmy2k4zyxjjzvl7wacwjjffqsxajry9s")))) + (base32 "139602gzgs0k91zb7dvgj1qh4ynb8g1lbxsswdim18hcb6ykgzy0")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-2) + ("rust-ioslice" ,rust-ioslice-0.6) ("rust-libc" ,rust-libc-0.2) - ("rust-redox-syscall" ,rust-redox-syscall-0.4)))) + ("rust-redox-syscall" ,rust-redox-syscall-0.5)))) (home-page "https://gitlab.redox-os.org/redox-os/libredox.git") (synopsis "Redox stable ABI") (description "This package provides Redox's stable ABI.") (license license:expat))) +(define-public rust-libredox-0.0.2 + (package + (inherit rust-libredox-0.1) + (name "rust-libredox") + (version "0.0.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "libredox" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "01v6pb09j7dl2gnbvzz6zmy2k4zyxjjzvl7wacwjjffqsxajry9s")))) + (arguments + `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-2) + ("rust-libc" ,rust-libc-0.2) + ("rust-redox-syscall" ,rust-redox-syscall-0.4)))))) + (define-public rust-librespot-audio-0.4 (package (name "rust-librespot-audio") @@ -34698,17 +38780,17 @@ This package contains the protobuf logic.") (description "This package provides Rust bindings to libsensors.") (license license:miros))) -(define-public rust-libsqlite3-sys-0.27 +(define-public rust-libsqlite3-sys-0.28 (package (name "rust-libsqlite3-sys") - (version "0.27.0") + (version "0.28.0") (source (origin (method url-fetch) (uri (crate-uri "libsqlite3-sys" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "05pp60ncrmyjlxxjj187808jkvpxm06w5lvvdwwvxd2qrmnj4kng")))) + (base32 "0gzwfw0n2wqgaihcgj65wzd3lclfxyy62gixq8sv6z04fi15h40c")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-bindgen" ,rust-bindgen-0.69) @@ -34722,9 +38804,32 @@ This package contains the protobuf logic.") (inputs (list sqlite)) (home-page "https://github.com/rusqlite/rusqlite") (synopsis "Native bindings to the libsqlite3 library") - (description "Native bindings to the libsqlite3 library.") + (description + "This package provides native Rust bindings to the libsqlite3 library.") (license license:expat))) +(define-public rust-libsqlite3-sys-0.27 + (package + (inherit rust-libsqlite3-sys-0.28) + (name "rust-libsqlite3-sys") + (version "0.27.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "libsqlite3-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "05pp60ncrmyjlxxjj187808jkvpxm06w5lvvdwwvxd2qrmnj4kng")))) + (arguments + `(#:cargo-inputs (("rust-bindgen" ,rust-bindgen-0.69) + ("rust-cc" ,rust-cc-1) + ("rust-openssl-sys" ,rust-openssl-sys-0.9) + ("rust-pkg-config" ,rust-pkg-config-0.3) + ("rust-prettyplease" ,rust-prettyplease-0.2) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-2) + ("rust-vcpkg" ,rust-vcpkg-0.2)))))) + (define-public rust-libsqlite3-sys-0.26 (package (inherit rust-libsqlite3-sys-0.27) @@ -34846,15 +38951,14 @@ C parser and toolkit developed for the GNOME project.") (package (inherit rust-libxml-0.3) (name "rust-libxml") - (version "0.2.17") + (version "0.2.16") (source (origin (method url-fetch) (uri (crate-uri "libxml" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1z567rqb55hxn0g7hpvcsh3nfvz9mdzlwk4mk179z9bkf7v10r29")))))) + (base32 "1xx1bsay6c0jy9vi7qcvliidya33lvbkxwpdfz9qmzl23f11xxxh")))))) (define-public rust-libz-sys-1 (package @@ -35309,8 +39413,36 @@ Linux userspace APIs.") ("rust-pkg-config" ,rust-pkg-config-0.3) ("rust-vcpkg" ,rust-vcpkg-0.2)))))) +(define-public rust-libtest-mimic-0.7 + (package + (name "rust-libtest-mimic") + (version "0.7.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "libtest-mimic" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "02y7l5bcwli37hl625bp6l0m95mry8cavwj3nkl55zgc8iplq3vz")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-clap" ,rust-clap-4) + ("rust-escape8259" ,rust-escape8259-0.5) + ("rust-termcolor" ,rust-termcolor-1) + ("rust-threadpool" ,rust-threadpool-1)) + #:cargo-development-inputs + (("rust-fastrand" ,rust-fastrand-1) + ("rust-pretty-assertions" ,rust-pretty-assertions-1)))) + (home-page "https://github.com/LukasKalbertodt/libtest-mimic") + (synopsis "Tools for writing a test harness") + (description + "Write your own test harness that looks and behaves like the built-in test +harness used by @code{rustc --test}.") + (license (list license:expat license:asl2.0)))) + (define-public rust-libtest-mimic-0.6 (package + (inherit rust-libtest-mimic-0.7) (name "rust-libtest-mimic") (version "0.6.1") (source (origin @@ -35320,7 +39452,6 @@ Linux userspace APIs.") (sha256 (base32 "1rwwdrzc5hmfisc9c3zcvnab14rgh0zfa636c2jbhv4az5qf73bd")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-clap" ,rust-clap-4) @@ -35328,13 +39459,7 @@ Linux userspace APIs.") ("rust-threadpool" ,rust-threadpool-1)) #:cargo-development-inputs (("rust-fastrand" ,rust-fastrand-1) - ("rust-pretty-assertions" ,rust-pretty-assertions-1)))) - (home-page "https://github.com/LukasKalbertodt/libtest-mimic") - (synopsis "Tools for writing a test harness") - (description - "Write your own test harness that looks and behaves like the built-in test -harness used by @code{rustc --test}.") - (license (list license:expat license:asl2.0)))) + ("rust-pretty-assertions" ,rust-pretty-assertions-1)))))) (define-public rust-libtest-mimic-0.5 (package @@ -35379,19 +39504,47 @@ harness used by @code{rustc --test}.") ("rust-structopt" ,rust-structopt-0.3) ("rust-termcolor" ,rust-termcolor-1)))))) -(define-public rust-litrs-0.2 +(define-public rust-listenfd-1 + (package + (name "rust-listenfd") + (version "1.0.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "listenfd" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "15jc2xgrp4j6508s5f9d9gq6w1ssgv2mvc5b3795jqnrmiih8l70")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2) + ("rust-uuid" ,rust-uuid-1) + ("rust-winapi" ,rust-winapi-0.3)) + #:cargo-development-inputs (("rust-hyper" ,rust-hyper-0.14) + ("rust-tokio" ,rust-tokio-1) + ("rust-warp" ,rust-warp-0.3)))) + (home-page "https://github.com/mitsuhiko/rust-listenfd") + (synopsis "Library to work with listenfds passed from the outside") + (description + "This package provides a simple library to work with listenfds passed from +the outside, such as systemd/catflap socket activation.") + (license license:asl2.0))) + +(define-public rust-litrs-0.4 (package (name "rust-litrs") - (version "0.2.3") - (source (origin - (method url-fetch) - (uri (crate-uri "litrs" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 "1akrxglqv6dz41jrjr409pjjysd00z5w0949007v52yg6c4mw9zr")))) + (version "0.4.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "litrs" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "19cssch9gc0x2snd9089nvwzz79zx6nzsi3icffpx25p4hck1kml")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1)))) + `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-unicode-xid" ,rust-unicode-xid-0.2)))) (home-page "https://github.com/LukasKalbertodt/litrs/") (synopsis "Parse and inspect Rust literals") (description @@ -35400,6 +39553,20 @@ language representing fixed values). Particularly useful for proc macros, but can also be used outside of a proc-macro context.") (license (list license:expat license:asl2.0)))) +(define-public rust-litrs-0.2 + (package + (inherit rust-litrs-0.4) + (name "rust-litrs") + (version "0.2.3") + (source (origin + (method url-fetch) + (uri (crate-uri "litrs" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1akrxglqv6dz41jrjr409pjjysd00z5w0949007v52yg6c4mw9zr")))) + (arguments + `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1)))))) + (define-public rust-llvm-bitcode-0.1 (package (name "rust-llvm-bitcode") @@ -35419,6 +39586,49 @@ can also be used outside of a proc-macro context.") (description "This package provides an LLVM Bitcode parser in Rust.") (license license:expat))) +(define-public rust-local-channel-0.1 + (package + (name "rust-local-channel") + (version "0.1.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "local-channel" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1j1ywn459kl4fdmjfyljm379k40qwwscd7mqp25lppxqd5gcijxn")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; use of undeclared crate or module `futures_util` + #:cargo-inputs (("rust-futures-core" ,rust-futures-core-0.3) + ("rust-futures-sink" ,rust-futures-sink-0.3) + ("rust-local-waker" ,rust-local-waker-0.1)))) + (home-page "https://github.com/actix/actix-net") + (synopsis + "Non-threadsafe multi-producer, single-consumer, futures-aware, FIFO queue") + (description + "This package provides a non-threadsafe multi-producer, single-consumer, +futures-aware, FIFO queue.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-local-waker-0.1 + (package + (name "rust-local-waker") + (version "0.1.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "local-waker" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "11vlcm8q6dhdf0srkgjnwca48dn9zcz820fq20hv82ffcxy3v1sd")))) + (build-system cargo-build-system) + (home-page "https://github.com/actix/actix-net") + (synopsis "Synchronization primitive for thread-local task wakeup") + (description "This package provides a synchronization primitive for +thread-local task wakeup.") + (license (list license:expat license:asl2.0)))) + (define-public rust-locale-0.2 (package (name "rust-locale") @@ -35572,7 +39782,7 @@ network interfaces/adapters.") (define-public rust-log-0.4 (package (name "rust-log") - (version "0.4.20") + (version "0.4.21") (source (origin (method url-fetch) @@ -35580,7 +39790,7 @@ network interfaces/adapters.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "13rf7wphnwd61vazpxr7fiycin6cb1g8fmvgqg18i464p0y1drmm")))) + "074hldq1q8rlzq2s2qa8f25hj4s3gpw71w64vdwzjd01a4g8rvch")))) (build-system cargo-build-system) (arguments `(#:tests? #f ; Not all test files included in release. @@ -35592,6 +39802,7 @@ network interfaces/adapters.") #:cargo-development-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) ("rust-serde-test" ,rust-serde-test-1) ("rust-sval" ,rust-sval-2) ("rust-sval-derive" ,rust-sval-derive-2) @@ -35847,18 +40058,17 @@ explosion.") (define-public rust-loop9-0.1 (package (name "rust-loop9") - (version "0.1.3") + (version "0.1.5") (source (origin (method url-fetch) (uri (crate-uri "loop9" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0h4rys8001cdq4l2f30k66wmvscm4lb2laxgpia794p5652800x7")))) + (base32 "0qphc1c0cbbx43pwm6isnwzwbg6nsxjh7jah04n1sg5h4p0qgbhg")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-imgref" ,rust-imgref-1)))) (home-page "https://lib.rs/loop9") (synopsis "Helper function to visit every pixel and its neighbors") @@ -35867,8 +40077,47 @@ explosion.") image together with its neighboring pixels.") (license license:expat))) +(define-public rust-lopdf-0.31 + (package + (name "rust-lopdf") + (version "0.31.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "lopdf" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0npqs454hz7z8ycldyi154fxmra0vkmp5xbjbzm346sb32vf3j07")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-chrono" ,rust-chrono-0.4) + ("rust-encoding-rs" ,rust-encoding-rs-0.8) + ("rust-flate2" ,rust-flate2-1) + ("rust-image" ,rust-image-0.24) + ("rust-itoa" ,rust-itoa-1) + ("rust-linked-hash-map" ,rust-linked-hash-map-0.5) + ("rust-log" ,rust-log-0.4) + ("rust-md5" ,rust-md5-0.7) + ("rust-nom" ,rust-nom-7) + ("rust-pom" ,rust-pom-3) + ("rust-rayon" ,rust-rayon-1) + ("rust-serde" ,rust-serde-1) + ("rust-time" ,rust-time-0.3) + ("rust-weezl" ,rust-weezl-0.1)) + #:cargo-development-inputs (("rust-clap" ,rust-clap-4) + ("rust-env-logger" ,rust-env-logger-0.10) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-shellexpand" ,rust-shellexpand-3) + ("rust-tempfile" ,rust-tempfile-3)))) + (home-page "https://github.com/J-F-Liu/lopdf") + (synopsis "Rust library for PDF document manipulation") + (description + "This package provides a Rust library for PDF document manipulation.") + (license license:expat))) + (define-public rust-lopdf-0.29 (package + (inherit rust-lopdf-0.31) (name "rust-lopdf") (version "0.29.0") (source @@ -35878,7 +40127,6 @@ image together with its neighboring pixels.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "1p59fkn9rkas0jywm7z24970k3lpv71sxxabmkmnig3d1p26j3yy")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-chrono" ,rust-chrono-0.4) @@ -35893,14 +40141,8 @@ image together with its neighboring pixels.") ("rust-rayon" ,rust-rayon-1) ("rust-time" ,rust-time-0.2) ("rust-weezl" ,rust-weezl-0.1)) - #:cargo-development-inputs - (("rust-env-logger" ,rust-env-logger-0.9) - ("rust-tempfile" ,rust-tempfile-3)))) - (home-page "https://github.com/J-F-Liu/lopdf") - (synopsis "Rust library for PDF document manipulation") - (description - "This package provides a Rust library for PDF document manipulation.") - (license license:expat))) + #:cargo-development-inputs (("rust-env-logger" ,rust-env-logger-0.9) + ("rust-tempfile" ,rust-tempfile-3)))))) (define-public rust-lopdf-0.26 (package @@ -36016,8 +40258,32 @@ image together with its neighboring pixels.") key-value pairs.") (license (list license:expat license:asl2.0)))) +(define-public rust-lscolors-0.17 + (package + (name "rust-lscolors") + (version "0.17.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "lscolors" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "08z5jslgigvnpc1gj2i8r9pi8yn4m0pf8dzf3rk9grdidbzlyc2k")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-ansi-term" ,rust-ansi-term-0.12) + ("rust-crossterm" ,rust-crossterm-0.27) + ("rust-nu-ansi-term" ,rust-nu-ansi-term-0.50)) + #:cargo-development-inputs (("rust-tempfile" ,rust-tempfile-3)))) + (home-page "https://github.com/sharkdp/lscolors") + (synopsis "Colorize paths using the LS_COLORS environment variable") + (description + "Colorize paths using the LS_COLORS environment variable.") + (license (list license:expat license:asl2.0)))) + (define-public rust-lscolors-0.16 (package + (inherit rust-lscolors-0.17) (name "rust-lscolors") (version "0.16.0") (source @@ -36027,19 +40293,13 @@ key-value pairs.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "0yqfym0lfdkj0f7lpvd0a0brljs7cpknyh14c202frcpqfg202xb")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-ansi-term" ,rust-ansi-term-0.12) ("rust-crossterm" ,rust-crossterm-0.27) ("rust-nu-ansi-term" ,rust-nu-ansi-term-0.49)) #:cargo-development-inputs - (("rust-tempfile" ,rust-tempfile-3)))) - (home-page "https://github.com/sharkdp/lscolors") - (synopsis "Colorize paths using the LS_COLORS environment variable") - (description - "Colorize paths using the LS_COLORS environment variable.") - (license (list license:expat license:asl2.0)))) + (("rust-tempfile" ,rust-tempfile-3)))))) (define-public rust-lscolors-0.13 (package @@ -36060,35 +40320,76 @@ key-value pairs.") #:cargo-development-inputs (("rust-tempfile" ,rust-tempfile-3)))))) -(define-public rust-lsp-types-0.91 +(define-public rust-lsp-server-0.7 + (package + (name "rust-lsp-server") + (version "0.7.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "lsp-server" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "15bhdhkinhhw5fifrpmiiqdd4hwblac40jv0n7hxidbdiyvnb3r4")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-crossbeam-channel" ,rust-crossbeam-channel-0.5) + ("rust-log" ,rust-log-0.4) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1)) + #:cargo-development-inputs (("rust-ctrlc" ,rust-ctrlc-3) + ("rust-lsp-types" ,rust-lsp-types-0.95)))) + (home-page + "https://github.com/rust-lang/rust-analyzer/tree/master/lib/lsp-server") + (synopsis "Generic LSP server scaffold") + (description "This package provides generic LSP server scaffold.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-lsp-types-0.95 (package (name "rust-lsp-types") - (version "0.91.1") + (version "0.95.1") (source (origin (method url-fetch) (uri (crate-uri "lsp-types" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "1bk8iy7s80i2iqj1siyfm0rsdq2vwvz7lclsrcrx2pa2b4n32s13")))) + (base32 "0ra36fd4yr7lf5igfrdvwjx9g87z3a99mrjgzk9nq04viqxd6d4f")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-bitflags" ,rust-bitflags-1) - ("rust-serde" ,rust-serde-1) - ("rust-serde-json" ,rust-serde-json-1) - ("rust-serde-repr" ,rust-serde-repr-0.1) - ("rust-url" ,rust-url-2)))) + `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-serde-repr" ,rust-serde-repr-0.1) + ("rust-url" ,rust-url-2)))) (home-page "https://github.com/gluon-lang/lsp-types") (synopsis "Types for interaction with a language server") (description - "This package provides types useful for interacting with a language -server (LSP).") + "Types for interaction with a language server, using VSCode's Language +Server Protocol.") (license license:expat))) +(define-public rust-lsp-types-0.91 + (package + (inherit rust-lsp-types-0.95) + (name "rust-lsp-types") + (version "0.91.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "lsp-types" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1bk8iy7s80i2iqj1siyfm0rsdq2vwvz7lclsrcrx2pa2b4n32s13")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-serde-repr" ,rust-serde-repr-0.1) + ("rust-url" ,rust-url-2)))))) + (define-public rust-lsp-types-0.89 (package (inherit rust-lsp-types-0.91) @@ -36230,6 +40531,27 @@ server (LSP).") (description "LZ4 implementation in Rust, no unsafe by default.") (license license:expat))) +(define-public rust-lz4-flex-0.9 + (package + (inherit rust-lz4-flex-0.11) + (name "rust-lz4-flex") + (version "0.9.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "lz4_flex" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "18xm7s81bpfgvvrra2kknrbgfbi295diz90mkhxvr00phfrbp30s")))) + (arguments + `(#:cargo-inputs (("rust-twox-hash" ,rust-twox-hash-1)) + #:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.3) + ("rust-lz4-compress" ,rust-lz4-compress-0.1) + ("rust-lzzzz" ,rust-lzzzz-1) + ("rust-more-asserts" ,rust-more-asserts-0.2) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-snap" ,rust-snap-1)))))) + (define-public rust-lz4-sys-1 (package (name "rust-lz4-sys") @@ -36725,23 +41047,23 @@ template engine for Rust.") "This package provides a fast, type-safe template engine for Rust.") (license (list license:expat license:asl2.0)))) -(define-public rust-markup5ever-0.11 +(define-public rust-markup5ever-0.12 (package (name "rust-markup5ever") - (version "0.11.0") + (version "0.12.1") (source (origin (method url-fetch) (uri (crate-uri "markup5ever" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "05mhzsp6lfxla1fgd0ac283b405s6kyj27wj5r6d7wq42jxjj9ks")))) + "0idy4vjihg2dw73j2vkb5kdghvga3bwnw0qx8jwci4m6xfxkmkhn")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-log" ,rust-log-0.4) - ("rust-phf" ,rust-phf-0.10) - ("rust-phf-codegen" ,rust-phf-codegen-0.10) + ("rust-phf" ,rust-phf-0.11) + ("rust-phf-codegen" ,rust-phf-codegen-0.11) ("rust-string-cache" ,rust-string-cache-0.8) ("rust-string-cache-codegen" ,rust-string-cache-codegen-0.5) ("rust-tendril" ,rust-tendril-0.4)))) @@ -36751,6 +41073,27 @@ template engine for Rust.") "Common code for xml5ever and html5ever.") (license (list license:expat license:asl2.0)))) +(define-public rust-markup5ever-0.11 + (package + (inherit rust-markup5ever-0.12) + (name "rust-markup5ever") + (version "0.11.0") + (source (origin + (method url-fetch) + (uri (crate-uri "markup5ever" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "05mhzsp6lfxla1fgd0ac283b405s6kyj27wj5r6d7wq42jxjj9ks")))) + (arguments + `(#:cargo-inputs + (("rust-log" ,rust-log-0.4) + ("rust-phf" ,rust-phf-0.10) + ("rust-phf-codegen" ,rust-phf-codegen-0.10) + ("rust-string-cache" ,rust-string-cache-0.8) + ("rust-string-cache-codegen" ,rust-string-cache-codegen-0.5) + ("rust-tendril" ,rust-tendril-0.4)))))) + (define-public rust-markup5ever-0.10 (package (inherit rust-markup5ever-0.11) @@ -36868,6 +41211,27 @@ in html5ever/xml5ever") (("rust-rustc-test" ,rust-rustc-test-0.3) ("rust-serde-json" ,rust-serde-json-1)))))) +(define-public rust-mas-iana-0.7 + (package + (name "rust-mas-iana") + (version "0.7.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "mas-iana" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "18yz6lv54crny8nmx4dpy3j2j00v8s80zsczzcg4fh1jyw6q4j0w")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-schemars" ,rust-schemars-0.8) + ("rust-serde" ,rust-serde-1)))) + (home-page "https://matrix-org.github.io/matrix-authentication-service/") + (synopsis "IANA registry data for JOSE and OAuth 2.0") + (description "This package provides IANA registry data for JOSE and +OAuth 2.0.") + (license license:asl2.0))) + (define-public rust-matchit-0.7 (package (name "rust-matchit") @@ -37563,21 +41927,18 @@ for Rust structs.") (package (inherit rust-memoffset-0.6) (name "rust-memoffset") - (version "0.5.3") + (version "0.5.6") (source (origin (method url-fetch) (uri (crate-uri "memoffset" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1fblqzc25hfaym8m0pj112s66pqq87avvaqm5hp5rskib2w9w63m")))) + (base32 "1ahi51aa650s2p9ib1a4ifgqv0pzmsxlm9z4xdgvi9zdd7q7ac84")))) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-rustc-version" ,rust-rustc-version-0.2)) - #:cargo-development-inputs - (("rust-doc-comment" ,rust-doc-comment-0.3)))) + `(#:tests? #f ; reference to packed field is unaligned + #:cargo-inputs (("rust-autocfg" ,rust-autocfg-1)) + #:cargo-development-inputs (("rust-doc-comment" ,rust-doc-comment-0.3)))) (inputs '()))) (define-public rust-memory-units-0.4 @@ -37600,22 +41961,20 @@ for Rust structs.") (define-public rust-memsec-0.6 (package (name "rust-memsec") - (version "0.6.0") + (version "0.6.3") (source (origin (method url-fetch) (uri (crate-uri "memsec" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1pfbpl75586bjdkphnaa4j58d668rl1wgcqzpnpzzx1phxfzkx1a")))) + (base32 "0z5s2pawma2xdwiswzshp4r9s8m0yhivsw91h99x50hm01mr380g")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-getrandom" ,rust-getrandom-0.1) + `(#:cargo-inputs + (("rust-getrandom" ,rust-getrandom-0.2) ("rust-libc" ,rust-libc-0.2) - ("rust-mach-o-sys" ,rust-mach-o-sys-0.1) - ("rust-winapi" ,rust-winapi-0.3)))) + ("rust-windows-sys" ,rust-windows-sys-0.45)))) (home-page "https://github.com/quininer/memsec") (synopsis "Rust implementation of libsodium/utils") (description "This package provides a Rust implementation of @@ -37633,7 +41992,12 @@ for Rust structs.") (uri (crate-uri "memsec" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "13ir50j549gdz94pds1i7ljnk14d66q5x91s11hncm1pih7jif8c")))))) + (base32 "13ir50j549gdz94pds1i7ljnk14d66q5x91s11hncm1pih7jif8c")))) + (arguments + `(#:cargo-inputs (("rust-getrandom" ,rust-getrandom-0.1) + ("rust-libc" ,rust-libc-0.2) + ("rust-mach-o-sys" ,rust-mach-o-sys-0.1) + ("rust-winapi" ,rust-winapi-0.3)))))) (define-public rust-memuse-0.2 (package @@ -37707,8 +42071,40 @@ for Rust structs.") to merge two objects of the same type into one.") (license (list license:asl2.0 license:expat)))) +(define-public rust-merlin-3 + (package + (name "rust-merlin") + (version "3.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "merlin" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0z9rh9jlpcs0i0cijbs6pcq26gl4qwz05y7zbnv7h2gwk4kqxhsq")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-byteorder" ,rust-byteorder-1) + ("rust-hex" ,rust-hex-0.3) + ("rust-keccak" ,rust-keccak-0.1) + ("rust-rand-core" ,rust-rand-core-0.6) + ("rust-zeroize" ,rust-zeroize-1)) + #:cargo-development-inputs + (("rust-curve25519-dalek-ng" ,rust-curve25519-dalek-ng-4) + ("rust-rand-chacha" ,rust-rand-chacha-0.3) + ("rust-strobe-rs" ,rust-strobe-rs-0.5)))) + (home-page "https://docs.rs/merlin") + (synopsis + "Composable proof transcripts for public-coin arguments of knowledge") + (description + "Merlin is a STROBE-based transcript construction for zero-knowledge +proofs. It automates the Fiat-Shamir transform, so that by using Merlin, +non-interactive protocols can be implemented as if they were interactive.") + (license license:expat))) + (define-public rust-merlin-2 (package + (inherit rust-merlin-3) (name "rust-merlin") (version "2.0.0") (source @@ -37726,63 +42122,7 @@ to merge two objects of the same type into one.") ("rust-hex" ,rust-hex-0.3) ("rust-keccak" ,rust-keccak-0.1) ("rust-rand-core" ,rust-rand-core-0.5) - ("rust-zeroize" ,rust-zeroize-1)))) - (home-page "https://docs.rs/merlin") - (synopsis "Composable proof transcripts for public-coin arguments of -knowledge") - (description - "Merlin is a STROBE-based transcript construction for zero-knowledge -proofs. It automates the Fiat-Shamir transform, so that by using Merlin, -non-interactive protocols can be implemented as if they were interactive.") - (license license:expat))) - -(define-public rust-thousands-0.2 - (package - (name "rust-thousands") - (version "0.2.0") - (source (origin - (method url-fetch) - (uri (crate-uri "thousands" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "0848gnkn7ah51lrx15z9zmn701ipn6gc4xbk4kfdlfahkypkpxiv")))) - (build-system cargo-build-system) - (arguments - `(#:skip-build? #t)) - (home-page "https://github.com/tov/thousands-rs") - (synopsis "Adds digit separators to numerals, configurably.") - (description "This package provides thousand separators for numerals.") - (license (list license:expat license:asl2.0)))) - -(define-public rust-twox-hash-1 - (package - (name "rust-twox-hash") - (version "1.6.3") - (source - (origin - (method url-fetch) - (uri (crate-uri "twox-hash" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 "0xgn72j36a270l5ls1jk88n7bmq2dhlfkbhdh5554hbagjsydzlp")))) - (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("rust-cfg-if" ,rust-cfg-if-0.1) - ("rust-digest" ,rust-digest-0.8) - ("rust-digest" ,rust-digest-0.9) - ("rust-digest" ,rust-digest-0.10) - ("rust-rand" ,rust-rand-0.8) - ("rust-serde" ,rust-serde-1) - ("rust-static-assertions" ,rust-static-assertions-1)) - #:cargo-development-inputs - (("rust-serde-json" ,rust-serde-json-1)))) - (home-page "https://github.com/shepmaster/twox-hash") - (synopsis "Rust implementation of the XXHash and XXH3 algorithms") - (description "This package provides a Rust implementation of the XXHash -and XXH3 algorithms.") - (license license:expat))) + ("rust-zeroize" ,rust-zeroize-1)))))) (define-public rust-metrics-macros-0.2 (package @@ -37883,6 +42223,126 @@ quality, high performance hash algorithm.") "This package provides a simple math expression parser and evaluator.") (license (list license:unlicense license:expat)))) +(define-public rust-miette-7 + (package + (name "rust-miette") + (version "7.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "miette" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1hdgjkkj1vgiqn9dq445m1p8z4y8adiaig8gh2mhsahc699qip2f")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-backtrace" ,rust-backtrace-0.3) + ("rust-backtrace-ext" ,rust-backtrace-ext-0.2) + ("rust-cfg-if" ,rust-cfg-if-1) + ("rust-miette-derive" ,rust-miette-derive-7) + ("rust-owo-colors" ,rust-owo-colors-4) + ("rust-serde" ,rust-serde-1) + ("rust-supports-color" ,rust-supports-color-3) + ("rust-supports-hyperlinks" ,rust-supports-hyperlinks-3) + ("rust-supports-unicode" ,rust-supports-unicode-3) + ("rust-syntect" ,rust-syntect-5) + ("rust-terminal-size" ,rust-terminal-size-0.3) + ("rust-textwrap" ,rust-textwrap-0.16) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-unicode-width" ,rust-unicode-width-0.1)) + #:cargo-development-inputs + (("rust-futures" ,rust-futures-0.3) + ("rust-indenter" ,rust-indenter-0.3) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-regex" ,rust-regex-1) + ("rust-rustversion" ,rust-rustversion-1) + ("rust-semver" ,rust-semver-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-strip-ansi-escapes" ,rust-strip-ansi-escapes-0.2) + ("rust-syn" ,rust-syn-2) + ("rust-trybuild" ,rust-trybuild-1)))) + (home-page "https://github.com/zkat/miette") + (synopsis "Diagnostic reporting library and protocol") + (description + "This package provides a diagnostic reporting library and protocol.") + (license license:asl2.0))) + +(define-public rust-miette-5 + (package + (inherit rust-miette-7) + (name "rust-miette") + (version "5.10.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "miette" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0vl5qvl3bgha6nnkdl7kiha6v4ypd6d51wyc4q1bvdpamr75ifsr")))) + (arguments + `(#:cargo-inputs (("rust-backtrace" ,rust-backtrace-0.3) + ("rust-backtrace-ext" ,rust-backtrace-ext-0.2) + ("rust-is-terminal" ,rust-is-terminal-0.4) + ("rust-miette-derive" ,rust-miette-derive-5) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-owo-colors" ,rust-owo-colors-3) + ("rust-serde" ,rust-serde-1) + ("rust-supports-color" ,rust-supports-color-2) + ("rust-supports-hyperlinks" ,rust-supports-hyperlinks-2) + ("rust-supports-unicode" ,rust-supports-unicode-2) + ("rust-terminal-size" ,rust-terminal-size-0.1) + ("rust-textwrap" ,rust-textwrap-0.15) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-unicode-width" ,rust-unicode-width-0.1)) + #:cargo-development-inputs (("rust-futures" ,rust-futures-0.3) + ("rust-indenter" ,rust-indenter-0.3) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-regex" ,rust-regex-1) + ("rust-rustversion" ,rust-rustversion-1) + ("rust-semver" ,rust-semver-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-syn" ,rust-syn-2) + ("rust-trybuild" ,rust-trybuild-1)))))) + +(define-public rust-miette-derive-7 + (package + (name "rust-miette-derive") + (version "7.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "miette-derive" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0v4sczg1n88arqwilhir1g97y5vsq9zjmpxn8v1ni05czaprrw6w")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-2)))) + (home-page "https://github.com/zkat/miette") + (synopsis "Derive macros for miette") + (description + "This package provides derive macros for miette.") + (license license:asl2.0))) + +(define-public rust-miette-derive-5 + (package + (inherit rust-miette-derive-7) + (name "rust-miette-derive") + (version "5.10.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "miette-derive" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0p33msrngkxlp5ajm8nijamii9vcwwpy8gfh4m53qnmrc0avrrs9")))) + (arguments + `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-2)))))) + (define-public rust-migrations-internals-1 (package (name "rust-migrations-internals") @@ -37940,6 +42400,29 @@ migration mechanism.") embedded migrations.") (license (list license:expat license:asl2.0)))) +(define-public rust-mimalloc-0.1 + (package + (name "rust-mimalloc") + (version "0.1.39") + (source + (origin + (method url-fetch) + (uri (crate-uri "mimalloc" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "176w9gf5qxs07kd2q39f0k25rzmp4kyx5r13wc8sk052bqmr40gs")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-libmimalloc-sys" ,rust-libmimalloc-sys-0.1)))) + (inputs (list mimalloc)) + (home-page "https://crates.io/crates/mimalloc") + (synopsis "Performance and security oriented drop-in allocator") + (description "This package provides a performance and security oriented +drop-in allocator.") + (license license:expat))) + (define-public rust-mimalloc-rust-0.1 (package (name "rust-mimalloc-rust") @@ -38050,7 +42533,7 @@ embedded migrations.") (define-public rust-mime-guess-2 (package (name "rust-mime-guess") - (version "2.0.3") + (version "2.0.4") (source (origin (method url-fetch) @@ -38058,15 +42541,14 @@ embedded migrations.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "04pjpbl90z4yn0cmifvwgf4mqznciw6b095k626q96bxx71d9116")))) + "1vs28rxnbfwil6f48hh58lfcx90klcvg68gxdc60spwa4cy2d4j1")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-mime" ,rust-mime-0.3) ("rust-unicase" ,rust-unicase-2)) #:cargo-development-inputs - (("rust-criterion" ,rust-criterion-0.3) - ("rust-unicase" ,rust-unicase-2)))) + (("rust-criterion" ,rust-criterion-0.3)))) (home-page "https://github.com/abonander/mime_guess") (synopsis "Detect a file's MIME type by its extension") (description "This package provides a simple crate for detection of a @@ -38193,8 +42675,28 @@ file's MIME type by its extension.") ("rust-serde-json" ,rust-serde-json-1) ("rust-similar-asserts" ,rust-similar-asserts-1)))))) +(define-public rust-minimad-0.13 + (package + (name "rust-minimad") + (version "0.13.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "minimad" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0s72q9h0807pc450n23nzis4s38m6ihiil5azj1bhj8f8c7n3i7n")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-once-cell" ,rust-once-cell-1)))) + (home-page "https://github.com/Canop/minimad") + (synopsis "Light markdown parser") + (description "Light markdown parser.") + (license license:expat))) + (define-public rust-minimad-0.9 (package + (inherit rust-minimad-0.13) (name "rust-minimad") (version "0.9.1") (source (origin @@ -38204,13 +42706,8 @@ file's MIME type by its extension.") (sha256 (base32 "0d2qnjwdrb3ngb0sayzj2b56pjb75ajqiaz4iw7zfs4537q3jxi7")))) - (build-system cargo-build-system) (arguments - `(#:cargo-inputs (("rust-once-cell" ,rust-once-cell-1)))) - (home-page "https://github.com/Canop/minimad") - (synopsis "Light markdown parser") - (description "Light markdown parser.") - (license license:expat))) + `(#:cargo-inputs (("rust-once-cell" ,rust-once-cell-1)))))) (define-public rust-minimal-lexical-0.2 (package @@ -38403,6 +42900,41 @@ streaming API for miniz_oxide.") "This package provides math interoperability standard types.") (license license:expat))) +(define-public rust-minus-5 + (package + (name "rust-minus") + (version "5.6.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "minus" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "19cwjr8ikqpngxj6c4xbbvylkjkp19cs4k2dnnav5ngzz4nywv6p")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-test-flags + '("--release" "--" ; unresolved imports + "--skip=src/lib.rs - (line 174)" + "--skip=src/lib.rs - (line 200)" + "--skip=src/lib.rs - (line 233)") + #:cargo-inputs + (("rust-crossbeam-channel" ,rust-crossbeam-channel-0.5) + ("rust-crossterm" ,rust-crossterm-0.27) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-parking-lot" ,rust-parking-lot-0.12) + ("rust-regex" ,rust-regex-1) + ("rust-textwrap" ,rust-textwrap-0.16) + ("rust-thiserror" ,rust-thiserror-1)) + #:cargo-development-inputs + (("rust-tokio" ,rust-tokio-1)))) + (home-page "https://github.com/arijit79/minus") + (synopsis "Asynchronous data feedable terminal paging library for Rust") + (description + "This package provides a asynchronous data feedable terminal paging +library for Rust.") + (license (list license:expat license:asl2.0)))) + (define-public rust-mio-0.8 (package (name "rust-mio") @@ -38486,8 +43018,36 @@ possible over the OS abstractions.") ("rust-env-logger" ,rust-env-logger-0.4) ("rust-tempdir" ,rust-tempdir-0.3)))))) +(define-public rust-mio-aio-0.8 + (package + (name "rust-mio-aio") + (version "0.8.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "mio-aio" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1ynga39vd3r7i3bjqsiv8b6b9z8ympby88l7vkk5cvhp6kn3livj")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t ; unresolved import `nix::sys::event` + #:cargo-inputs (("rust-mio" ,rust-mio-0.8) + ("rust-nix" ,rust-nix-0.27) + ("rust-pin-utils" ,rust-pin-utils-0.1)) + #:cargo-development-inputs (("rust-assert-impl" ,rust-assert-impl-0.1) + ("rust-mio" ,rust-mio-0.8) + ("rust-nix" ,rust-nix-0.27) + ("rust-sysctl" ,rust-sysctl-0.1) + ("rust-tempfile" ,rust-tempfile-3)))) + (home-page "https://github.com/asomers/mio-aio") + (synopsis "POSIX AIO bindings for mio") + (description "This package provides POSIX AIO bindings for mio.") + (license (list license:expat license:asl2.0)))) + (define-public rust-mio-aio-0.7 (package + (inherit rust-mio-aio-0.8) (name "rust-mio-aio") (version "0.7.0") (source @@ -38497,7 +43057,6 @@ possible over the OS abstractions.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "07y7wnkd4xvj48fyxgnfm9jqjldgqfd39k3ydfmaqc76mw36pagq")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t ; no variant named `SigevKevent` found for enum `SigevNotify` #:cargo-inputs @@ -38509,11 +43068,7 @@ possible over the OS abstractions.") ("rust-mio" ,rust-mio-0.8) ("rust-nix" ,rust-nix-0.24) ("rust-sysctl" ,rust-sysctl-0.1) - ("rust-tempfile" ,rust-tempfile-3)))) - (home-page "https://github.com/asomers/mio-aio") - (synopsis "POSIX AIO bindings for mio") - (description "This package provides POSIX AIO bindings for mio.") - (license (list license:expat license:asl2.0)))) + ("rust-tempfile" ,rust-tempfile-3)))))) (define-public rust-mio-anonymous-pipes-0.2 (package @@ -38642,8 +43197,29 @@ possible over the OS abstractions.") (description "Macros that provide source code annotations for MIRAI") (license license:expat))) +(define-public rust-mock-instant-0.3 + (package + (name "rust-mock-instant") + (version "0.3.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "mock_instant" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "180yr3i44a98w1mj36dd8xmym33rbzndpj0j1g13di52n8g8crlk")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-once-cell" ,rust-once-cell-1)))) + (home-page "https://github.com/museun/mock_instant") + (synopsis "Mock an std::time::Instant") + (description + "This package provides a simple way to mock an std::time::Instant in Rust.") + (license license:bsd-0))) + (define-public rust-mock-instant-0.2 (package + (inherit rust-mock-instant-0.3) (name "rust-mock-instant") (version "0.2.1") (source (origin @@ -38652,33 +43228,27 @@ possible over the OS abstractions.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "0vg0kmz96zazjdq57l57nm24mc2in57y090ywcq827xq8fi2jzki")))) - (build-system cargo-build-system) (arguments - `(#:cargo-inputs (("rust-once-cell" ,rust-once-cell-1)))) - (home-page "https://github.com/museun/mock_instant") - (synopsis "Mock an std::time::Instant") - (description - "This package provides a simple way to mock an std::time::Instant in rust.") - (license license:bsd-0))) + `(#:cargo-inputs (("rust-once-cell" ,rust-once-cell-1)))))) (define-public rust-mockall-0.11 (package (name "rust-mockall") - (version "0.11.1") + (version "0.11.4") (source (origin (method url-fetch) (uri (crate-uri "mockall" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0k3g3xxf195vsnzmwza047dv89zlg6h5yj5774wjlndgpdvf8han")))) + "15kww0a3wv300wkksc6zj0kz1jwk0hyly48daxs2vvpj300lk12c")))) (build-system cargo-build-system) (arguments `(#:tests? #f ; Not all files included. #:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-1) ("rust-downcast" ,rust-downcast-0.11) - ("rust-fragile" ,rust-fragile-1) + ("rust-fragile" ,rust-fragile-2) ("rust-lazy-static" ,rust-lazy-static-1) ("rust-mockall-derive" ,rust-mockall-derive-0.11) ("rust-predicates" ,rust-predicates-2) @@ -38700,14 +43270,14 @@ possible over the OS abstractions.") (define-public rust-mockall-derive-0.11 (package (name "rust-mockall-derive") - (version "0.11.1") + (version "0.11.4") (source (origin (method url-fetch) (uri (crate-uri "mockall_derive" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1ixhmsrg5ky4b2jlvbxhlpr3mbv7frd6wr8msm005vijb5rmcb96")))) + "1fvc9kwjcc9ia6ng7z9z02b4qkl9dvsx9m4z51xz9i0mj1k7bki2")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -38716,7 +43286,7 @@ possible over the OS abstractions.") ("rust-quote" ,rust-quote-1) ("rust-syn" ,rust-syn-1)) #:cargo-development-inputs - (("rust-pretty-assertions" ,rust-pretty-assertions-0.7)))) + (("rust-pretty-assertions" ,rust-pretty-assertions-1)))) (home-page "https://github.com/asomers/mockall") (synopsis "Procedural macros for the Mockall crate") (description @@ -38786,6 +43356,20 @@ select the mock struct at compile time. Used with the Mockall crate.") debug_assert_* macros.") (license (list license:unlicense license:expat license:asl2.0 license:cc0)))) +(define-public rust-more-asserts-0.2 + (package + (inherit rust-more-asserts-0.3) + (name "rust-more-asserts") + (version "0.2.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "more-asserts" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "12b3fypg2sr4qmxy6wiyx6k9sdg573f5ij98cdmbrg00whnyqhvq")))) + (license license:cc0))) + (define-public rust-mozim-0.2 (package (name "rust-mozim") @@ -38880,23 +43464,44 @@ debug_assert_* macros.") (description "Linux kernel MPTCP path manager netlink Library.") (license license:expat))) -(define-public rust-multer-2 +(define-public rust-msvc-demangler-0.9 + (package + (name "rust-msvc-demangler") + (version "0.9.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "msvc-demangler" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1j7kkmbd9yvhk7dmvd29pqcg9mcjdw5p1ia1kihh16zss1nprdmz")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-1)))) + (home-page "https://github.com/mstange/msvc-demangler-rust") + (synopsis "Rust library that demangles C++ symbols mangled by MSVC") + (description + "This package provides a rust library that demangles (undecorates) +C++ symbols mangled by MSVC.") + (license (list license:expat license:ncsa)))) + +(define-public rust-multer-3 (package (name "rust-multer") - (version "2.1.0") + (version "3.0.0") (source (origin (method url-fetch) (uri (crate-uri "multer" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1hjiphaypj3phqaj5igrzcia9xfmf4rr4ddigbh8zzb96k1bvb01")))) + (base32 "06ajkcp0cjf66qxbp7swvdxkhmlg2wnjfbk3s9py9hx9w0mm4pd1")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-bytes" ,rust-bytes-1) ("rust-encoding-rs" ,rust-encoding-rs-0.8) ("rust-futures-util" ,rust-futures-util-0.3) - ("rust-http" ,rust-http-0.2) + ("rust-http" ,rust-http-1) ("rust-httparse" ,rust-httparse-1) ("rust-log" ,rust-log-0.4) ("rust-memchr" ,rust-memchr-2) @@ -38907,10 +43512,12 @@ debug_assert_* macros.") ("rust-tokio" ,rust-tokio-1) ("rust-tokio-util" ,rust-tokio-util-0.7) ("rust-version-check" ,rust-version-check-0.9)) - #:cargo-development-inputs (("rust-hyper" ,rust-hyper-0.14) + #:cargo-development-inputs (("rust-http-body-util" ,rust-http-body-util-0.1) + ("rust-hyper" ,rust-hyper-1) + ("rust-hyper-util" ,rust-hyper-util-0.1) ("rust-serde" ,rust-serde-1) ("rust-tokio" ,rust-tokio-1)))) - (home-page "https://github.com/rousan/multer-rs") + (home-page "https://github.com/rwf2/multer-rs") (synopsis "Async parser for @code{multipart/form-data} content-type in Rust") (description "An async parser for @code{multipart/form-data} content-type in Rust. @@ -38919,6 +43526,37 @@ It accepts a Stream of Bytes as a source, so that it can be plugged into any async Rust environment e.g. any async server.") (license license:expat))) +(define-public rust-multer-2 + (package + (inherit rust-multer-3) + (name "rust-multer") + (version "2.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "multer" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1hjiphaypj3phqaj5igrzcia9xfmf4rr4ddigbh8zzb96k1bvb01")))) + (arguments + `(#:cargo-inputs (("rust-bytes" ,rust-bytes-1) + ("rust-encoding-rs" ,rust-encoding-rs-0.8) + ("rust-futures-util" ,rust-futures-util-0.3) + ("rust-http" ,rust-http-0.2) + ("rust-httparse" ,rust-httparse-1) + ("rust-log" ,rust-log-0.4) + ("rust-memchr" ,rust-memchr-2) + ("rust-mime" ,rust-mime-0.3) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-spin" ,rust-spin-0.9) + ("rust-tokio" ,rust-tokio-1) + ("rust-tokio-util" ,rust-tokio-util-0.7) + ("rust-version-check" ,rust-version-check-0.9)) + #:cargo-development-inputs (("rust-hyper" ,rust-hyper-0.14) + ("rust-serde" ,rust-serde-1) + ("rust-tokio" ,rust-tokio-1)))))) + (define-public rust-muldiv-1 (package (name "rust-muldiv") @@ -38962,8 +43600,32 @@ multiplication and division with overflow protection.") (description "This package provides a multimap implementation.") (license (list license:expat license:asl2.0)))) +(define-public rust-multiversion-0.7 + (package + (name "rust-multiversion") + (version "0.7.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "multiversion" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0al7yrf489lqzxx291sx9566n7slk2njwlqrxbjhqxk1zvbvkixj")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-multiversion-macros" ,rust-multiversion-macros-0.7) + ("rust-target-features" ,rust-target-features-0.1)) + #:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.4) + ("rust-rustversion" ,rust-rustversion-1)))) + (home-page "https://github.com/calebzulawski/multiversion") + (synopsis "Function multiversioning attribute macros for Rust") + (description "This crate provides function multiversioning attribute +macros for Rust.") + (license (list license:expat license:asl2.0)))) + (define-public rust-multiversion-0.6 (package + (inherit rust-multiversion-0.7) (name "rust-multiversion") (version "0.6.1") (source @@ -38973,41 +43635,52 @@ multiplication and division with overflow protection.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "0wsk9ykdqjd6c54rf5l6yb6ps4hx409cda8aa875xk6k7lm9cp02")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-multiversion-macros" ,rust-multiversion-macros-0.6)))) + (("rust-multiversion-macros" ,rust-multiversion-macros-0.6)))))) + +(define-public rust-multiversion-macros-0.7 + (package + (name "rust-multiversion-macros") + (version "0.7.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "multiversion-macros" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1j1avbxw7jscyi7dmnywhlwbiny1fvg1vpp9fy4dc1pd022kva16")))) + (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) + ("rust-target-features" ,rust-target-features-0.1)))) (home-page "https://github.com/calebzulawski/multiversion") - (synopsis "Function multiversioning attribute macros for Rust") - (description "This crate provides function multiversioning attribute -macros for Rust.") + (synopsis "Implementation crate for multiversion") + (description "This is an implementation crate for multiversion Rust +library.") (license (list license:expat license:asl2.0)))) (define-public rust-multiversion-macros-0.6 (package + (inherit rust-multiversion-macros-0.7) (name "rust-multiversion-macros") (version "0.6.1") (source (origin (method url-fetch) (uri (crate-uri "multiversion-macros" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "1bzkmxgyiwsanqf4lsdzx5gn4harza4rdrzkq5hgksw2wfyy58x8")))) - (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/calebzulawski/multiversion") - (synopsis "Implementation crate for multiversion") - (description "This is an implementation crate for multiversion Rust -library.") - (license (list license:expat license:asl2.0)))) + ("rust-syn" ,rust-syn-1)))))) (define-public rust-mustache-0.9 (package @@ -41073,7 +45746,7 @@ nitrokey-test crate.") #:cargo-inputs (("rust-bitflags" ,rust-bitflags-2) ("rust-cfg-if" ,rust-cfg-if-1) ("rust-cfg-aliases" ,rust-cfg-aliases-0.1) - ("rust-libc" ,rust-libc-0.2.153) + ("rust-libc" ,rust-libc-0.2) ("rust-memoffset" ,rust-memoffset-0.9) ("rust-pin-utils" ,rust-pin-utils-0.1)) #:cargo-development-inputs (("rust-assert-impl" ,rust-assert-impl-0.1) @@ -41085,11 +45758,15 @@ nitrokey-test crate.") ("rust-tempfile" ,rust-tempfile-3)))) (home-page "https://github.com/nix-rust/nix") (synopsis "Rust friendly bindings to *nix APIs") - (description "Rust friendly bindings to *nix APIs") + (description + "Nix seeks to provide friendly bindings to various *nix platform APIs. +The goal is to not provide a 100% unified interface, but to unify what can be +while still providing platform specific APIs.") (license license:expat))) (define-public rust-nix-0.27 (package + (inherit rust-nix-0.28) (name "rust-nix") (version "0.27.1") (source @@ -41099,7 +45776,6 @@ nitrokey-test crate.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "0ly0kkmij5f0sqz35lx9czlbk6zpihb7yh1bsy4irzwfd2f4xc1f")))) - (build-system cargo-build-system) (arguments `(#:tests? #f ; unresolved import `nix::sys::aio` #:cargo-inputs @@ -41115,36 +45791,57 @@ nitrokey-test crate.") ("rust-rand" ,rust-rand-0.8) ("rust-semver" ,rust-semver-1) ("rust-sysctl" ,rust-sysctl-0.4) - ("rust-tempfile" ,rust-tempfile-3)))) - (home-page "https://github.com/nix-rust/nix") - (synopsis "Rust friendly bindings to *nix APIs") - (description - "Nix seeks to provide friendly bindings to various *nix platform APIs. -The goal is to not provide a 100% unified interface, but to unify what can be -while still providing platform specific APIs.") - (license license:expat))) + ("rust-tempfile" ,rust-tempfile-3)))))) (define-public rust-nix-0.26 (package (inherit rust-nix-0.27) (name "rust-nix") - (version "0.26.2") + (version "0.26.4") (source (origin (method url-fetch) (uri (crate-uri "nix" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "06lfvjhsj5zlslsg2jhijrm69npprmsh7r1667qnl7c2jv8s7pdz")))) + (base32 "06xgl4ybb8pvjrbmc3xggbgk3kbs1j0c4c0nzdfrmpbgrkrym2sr")))) (arguments - (list #:skip-build? #t + (list #:cargo-test-flags + `(list "--release" "--" + "--skip=sys::resource::test::test_self_cpu_time" + "--skip=test_unistd::test_execve::test_cstr_ref" + "--skip=test_unistd::test_execve::test_cstring" + "--skip=test_unistd::test_execveat_absolute::test_cstr_ref" + "--skip=test_unistd::test_execveat_absolute::test_cstring" + ;; Some of the tests hang. + "--skip=test_unistd::test_execveat_empty::test_cstr_ref" + "--skip=test_unistd::test_execveat_empty::test_cstring" + "--skip=test_unistd::test_execveat_relative::test_cstr_ref" + "--skip=test_unistd::test_execveat_relative::test_cstring" + "--skip=test_unistd::test_fexecve::test_cstr_ref" + "--skip=test_unistd::test_fexecve::test_cstring" + ;; Some doctests segfault. + "--skip=sys::personality::set" + "--skip=sys::socket::sendmsg" + "--skip=unistd::Group::from_gid" + "--skip=unistd::Group::from_name" + "--skip=unistd::User::from_name" + "--skip=unistd::User::from_uid") #:cargo-inputs `(("rust-bitflags" ,rust-bitflags-1) ("rust-cfg-if" ,rust-cfg-if-1) ("rust-libc" ,rust-libc-0.2) ("rust-memoffset" ,rust-memoffset-0.7) - ("rust-pin-utils" ,rust-pin-utils-0.1) - ("rust-static-assertions" ,rust-static-assertions-1)))))) + ("rust-pin-utils" ,rust-pin-utils-0.1)) + #:cargo-development-inputs + `(("rust-assert-impl" ,rust-assert-impl-0.1) + ("rust-caps" ,rust-caps-0.5) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-parking-lot" ,rust-parking-lot-0.12) + ("rust-rand" ,rust-rand-0.8) + ("rust-semver" ,rust-semver-1) + ("rust-sysctl" ,rust-sysctl-0.4) + ("rust-tempfile" ,rust-tempfile-3)))))) (define-public rust-nix-0.25 (package @@ -41201,22 +45898,49 @@ while still providing platform specific APIs.") (package (inherit rust-nix-0.24) (name "rust-nix") - (version "0.23.1") + (version "0.23.2") (source (origin (method url-fetch) (uri (crate-uri "nix" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1iimixk7y2qk0jswqich4mkd8kqyzdghcgy6203j8fmxmhbn71lz")))) + "0p5kxhm5d8lry0szqbsllpcb5i3z7lg1dkglw0ni2l011b090dwg")))) (arguments - (list #:skip-build? #t + (list #:cargo-test-flags + `(list "--release" "--" + "--skip=test_unistd::test_execve::test_cstr_ref" + "--skip=test_unistd::test_execve::test_cstring" + "--skip=test_unistd::test_execveat_absolute::test_cstr_ref" + "--skip=test_unistd::test_execveat_absolute::test_cstring" + ;; Some of the tests hang. + "--skip=test_unistd::test_execveat_empty::test_cstr_ref" + "--skip=test_unistd::test_execveat_empty::test_cstring" + "--skip=test_unistd::test_execveat_relative::test_cstr_ref" + "--skip=test_unistd::test_execveat_relative::test_cstring" + "--skip=test_unistd::test_fexecve::test_cstr_ref" + "--skip=test_unistd::test_fexecve::test_cstring" + ;; Some doctests segfault. + "--skip=sys::personality::set" + "--skip=unistd::Group::from_gid" + "--skip=unistd::Group::from_name" + "--skip=unistd::User::from_name" + "--skip=unistd::User::from_uid") #:cargo-inputs `(("rust-bitflags" ,rust-bitflags-1) ("rust-cc" ,rust-cc-1) ("rust-cfg-if" ,rust-cfg-if-1) ("rust-libc" ,rust-libc-0.2) - ("rust-memoffset" ,rust-memoffset-0.6)))))) + ("rust-memoffset" ,rust-memoffset-0.6)) + #:cargo-development-inputs + `(("rust-assert-impl" ,rust-assert-impl-0.1) + ("rust-caps" ,rust-caps-0.5) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-parking-lot" ,rust-parking-lot-0.11) + ("rust-rand" ,rust-rand-0.8) + ("rust-semver" ,rust-semver-1) + ("rust-sysctl" ,rust-sysctl-0.1) + ("rust-tempfile" ,rust-tempfile-3)))))) (define-public rust-nix-0.22 (package @@ -41229,13 +45953,31 @@ while still providing platform specific APIs.") (uri (crate-uri "nix" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1bsgc8vjq07a1wg9vz819bva3dvn58an4r87h80dxrfqkqanz4g4")) - (modules '((guix build utils))) - (snippet - '(begin (substitute* "Cargo.toml" - ((">= 1\\.1\\.0, < 1\\.3\\.0") ">= 1.1.0")))))) + (base32 "1bsgc8vjq07a1wg9vz819bva3dvn58an4r87h80dxrfqkqanz4g4")))) (arguments - `(#:tests? #f ; Tests hang forever. + `(#:cargo-test-flags + '("--release" "--" + "--skip=test_unistd::test_execve::test_cstr_ref" + "--skip=test_unistd::test_execve::test_cstring" + "--skip=test_unistd::test_execveat_absolute::test_cstr_ref" + "--skip=test_unistd::test_execveat_absolute::test_cstring" + ;; Some of the tests hang. + "--skip=sys::test_socket::test_af_alg_aead" + "--skip=test_unistd::test_execveat_empty::test_cstr_ref" + "--skip=test_unistd::test_execveat_empty::test_cstring" + "--skip=test_unistd::test_execveat_relative::test_cstr_ref" + "--skip=test_unistd::test_execveat_relative::test_cstring" + "--skip=test_unistd::test_fexecve::test_cstr_ref" + "--skip=test_unistd::test_fexecve::test_cstring" + ;; cannot find macro `libc_bitflags` in this scope + "--skip=macros::libc_bitflags" + "--skip=macros::libc_enum" + ;; Some doctests segfault. + "--skip=sys::personality::set" + "--skip=unistd::Group::from_gid" + "--skip=unistd::Group::from_name" + "--skip=unistd::User::from_name" + "--skip=unistd::User::from_uid") #:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) ("rust-cc" ,rust-cc-1) @@ -41249,51 +45991,122 @@ while still providing platform specific APIs.") ("rust-rand" ,rust-rand-0.8) ("rust-semver" ,rust-semver-1) ("rust-sysctl" ,rust-sysctl-0.1) - ("rust-tempfile" ,rust-tempfile-3)))) - (inputs - (list rust-bitflags-1 rust-cc-1 rust-cfg-if-1 rust-libc-0.2 - rust-memoffset-0.6)))) + ("rust-tempfile" ,rust-tempfile-3)))))) (define-public rust-nix-0.21 (package (inherit rust-nix-0.22) (name "rust-nix") - (version "0.21.0") + (version "0.21.2") (source (origin (method url-fetch) (uri (crate-uri "nix" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1isfgr239sxvkcjhcp08rz2nqi4s6w5ik2l2m183ldlxqkz2hdsw")))) + (base32 "1iqj1mvf15bja6i3kmsfrmmg5jwd02pxsg1v2ld69q583r9g7nbp")))) (arguments - `(#:skip-build? #t + `(#:cargo-test-flags + '("--release" "--" + "--skip=test_unistd::test_execve::test_cstr_ref" + "--skip=test_unistd::test_execve::test_cstring" + "--skip=test_unistd::test_execveat_absolute::test_cstr_ref" + "--skip=test_unistd::test_execveat_absolute::test_cstring" + ;; Some of the tests hang. + "--skip=sys::test_socket::test_af_alg_aead" + "--skip=test_unistd::test_execveat_empty::test_cstr_ref" + "--skip=test_unistd::test_execveat_empty::test_cstring" + "--skip=test_unistd::test_execveat_relative::test_cstr_ref" + "--skip=test_unistd::test_execveat_relative::test_cstring" + "--skip=test_unistd::test_fexecve::test_cstr_ref" + "--skip=test_unistd::test_fexecve::test_cstring" + ;; cannot find macro `libc_bitflags` in this scope + "--skip=macros::libc_bitflags" + "--skip=macros::libc_enum" + ;; Some doctests segfault. + "--skip=sys::personality::set" + "--skip=unistd::Group::from_gid" + "--skip=unistd::Group::from_name" + "--skip=unistd::User::from_name" + "--skip=unistd::User::from_uid") #:cargo-inputs - (("rust-bitflags" ,rust-bitflags-1) + (("rust-bitflags" ,rust-bitflags-1.2) ; Not a newer version. ("rust-cc" ,rust-cc-1) ("rust-cfg-if" ,rust-cfg-if-1) ("rust-libc" ,rust-libc-0.2) - ("rust-memoffset" ,rust-memoffset-0.6)))))) + ("rust-memoffset" ,rust-memoffset-0.6)) + #:cargo-development-inputs + (("rust-assert-impl" ,rust-assert-impl-0.1) + ("rust-caps" ,rust-caps-0.5) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-rand" ,rust-rand-0.8) + ("rust-semver" ,rust-semver-1) + ("rust-sysctl" ,rust-sysctl-0.1) + ("rust-tempfile" ,rust-tempfile-3)))))) (define-public rust-nix-0.20 (package (inherit rust-nix-0.21) (name "rust-nix") - (version "0.20.0") + (version "0.20.2") (source (origin (method url-fetch) (uri (crate-uri "nix" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "12n1syfd967hblrcrrqk63a4s1h4hsybfqwblh71rihvv8cli6zs")))) + (base32 "0ia96wf568sksplpcxzzf2m5jj974sri93469vpnh5b1zcln3q7m")))) (arguments - `(#:skip-build? #t + `(#:cargo-test-flags + '("--release" "--" + "--skip=test_unistd::test_execve::test_cstr_ref" + "--skip=test_unistd::test_execve::test_cstring" + "--skip=test_unistd::test_execveat_absolute::test_cstr_ref" + "--skip=test_unistd::test_execveat_absolute::test_cstring" + "--skip=sys::test_aio::test_liocb_listio_nowait" + "--skip=sys::test_aio::test_liocb_listio_signal" + "--skip=sys::test_aio::test_liocb_listio_wait" + "--skip=sys::test_aio::test_write_sigev_signal" + "--skip=sys::test_select::test_pselect" + "--skip=sys::test_signal::test_old_sigaction_flags" + "--skip=sys::test_signal::test_signal" + "--skip=sys::test_signal::test_signal_sigaction" + "--skip=sys::test_signal::test_sigprocmask" + "--skip=sys::test_signalfd::test_signalfd" + "--skip=test_unistd::test_alarm" + "--skip=test_unistd::test_canceling_alarm" + ;; Some of the tests hang. + "--skip=sys::test_socket::test_af_alg_aead" + "--skip=test_unistd::test_execveat_empty::test_cstr_ref" + "--skip=test_unistd::test_execveat_empty::test_cstring" + "--skip=test_unistd::test_execveat_relative::test_cstr_ref" + "--skip=test_unistd::test_execveat_relative::test_cstring" + "--skip=test_unistd::test_fexecve::test_cstr_ref" + "--skip=test_unistd::test_fexecve::test_cstring" + ;; cannot find macro `libc_bitflags` in this scope + "--skip=macros::libc_bitflags" + "--skip=macros::libc_enum" + ;; Some doctests segfault. + "--skip=sys::aio::LioCb<'a>::listio" + "--skip=sys::aio::aio_suspend" + "--skip=sys::personality::set" + "--skip=unistd::Group::from_gid" + "--skip=unistd::Group::from_name" + "--skip=unistd::User::from_name" + "--skip=unistd::User::from_uid") #:cargo-inputs - (("rust-bitflags" ,rust-bitflags-1) + (("rust-bitflags" ,rust-bitflags-1.2) ; Not a newer version. ("rust-cc" ,rust-cc-1) ("rust-cfg-if" ,rust-cfg-if-1) - ("rust-libc" ,rust-libc-0.2)))))) + ("rust-libc" ,rust-libc-0.2) + ("rust-memoffset" ,rust-memoffset-0.6)) + #:cargo-development-inputs (("rust-bytes" ,rust-bytes-0.4) + ("rust-caps" ,rust-caps-0.5) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-rand" ,rust-rand-0.6) + ("rust-semver" ,rust-semver-0.9) + ("rust-sysctl" ,rust-sysctl-0.1) + ("rust-tempfile" ,rust-tempfile-3)))))) (define-public rust-nix-0.19 (package @@ -41505,29 +46318,42 @@ prove a function can't ever panic.") make porting your crate to no_std *easy*.") (license license:expat))) -(define-public rust-no-std-net-0.5 +(define-public rust-no-std-net-0.6 (package (name "rust-no-std-net") - (version "0.5.0") + (version "0.6.0") (source (origin (method url-fetch) (uri (crate-uri "no-std-net" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "0lkilh0wc7big3m5lsn9wqiz2xvj21kgmpbc15z92j93n51wxkhv")))) + (base32 "0ravflgyh0q2142gjdz9iav5yqci3ga7gbnk4mmfcnqkrq54lya3")))) (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-test" ,rust-serde-test-1)))) (home-page "https://github.com/dunmatt/no-std-net") - (synopsis "Rust's std::net... without the @code{std}") - (description "This package provides Rust's std::net for environment -without the @code{std}.") + (synopsis "Rust's @code{std::net} without the @code{std}") + (description "This package provides Rust's @code{std::net} in an environment +without @code{std}.") (license license:expat))) +(define-public rust-no-std-net-0.5 + (package + (inherit rust-no-std-net-0.6) + (name "rust-no-std-net") + (version "0.5.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "no-std-net" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0lkilh0wc7big3m5lsn9wqiz2xvj21kgmpbc15z92j93n51wxkhv")))))) + (define-public rust-nodrop-0.1 (package (name "rust-nodrop") @@ -41721,6 +46547,27 @@ combinators library.") ("rust-memchr" ,rust-memchr-1) ("rust-regex" ,rust-regex-0.2)))))) +(define-public rust-nom-2 + (package + (inherit rust-nom-4) + (name "rust-nom") + (version "2.2.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "nom" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1zv6ig7nw532rl4p35jsahglfhyyznjkblwa6si6c0plxhlsflfg")))) + (arguments + `(#:cargo-test-flags + '("--release" "--" ; Cannot find file for tests. + "--skip=stream::tests::seeking_consumer" + "--skip=big_bunny_test" + "--skip=small_test") + #:cargo-inputs (("rust-lazy-static" ,rust-lazy-static-0.2) + ("rust-regex" ,rust-regex-0.2)))))) + (define-public rust-nom-1 (package (inherit rust-nom-4) @@ -41851,6 +46698,24 @@ combinators library (fork for proposals for v8)") nothing.") (license license:expat))) +(define-public rust-normalize-path-0.2 + (package + (name "rust-normalize-path") + (version "0.2.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "normalize-path" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0bc919zp34b9312wqd92jbi3xa9gxljxh8nfw7v6sk7znb98shzm")))) + (build-system cargo-build-system) + (home-page "https://github.com/cargo-bins/cargo-binstall") + (synopsis "Like canonicalize, but without performing I/O") + (description "This package provides a rust function like canonicalize, but +without performing I/O.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-normalize-line-endings-0.3 (package (name "rust-normalize-line-endings") @@ -42082,6 +46947,60 @@ notification library.") (("rust-tempfile" ,rust-tempfile-3)))) (license license:cc0))) +(define-public rust-notify-debouncer-mini-0.4 + (package + (name "rust-notify-debouncer-mini") + (version "0.4.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "notify-debouncer-mini" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0hwxdbzyx01pzwyld1dk7sc7ak5k3xkjz2l59ppwa7rajwhv4h2x")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-crossbeam-channel" ,rust-crossbeam-channel-0.5) + ("rust-log" ,rust-log-0.4) + ("rust-notify" ,rust-notify-6) + ("rust-serde" ,rust-serde-1)))) + (home-page "https://github.com/notify-rs/notify") + (synopsis "Notify mini debouncer") + (description "This crate is notify mini debouncer for events.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-notify-debouncer-full-0.3 + (package + (name "rust-notify-debouncer-full") + (version "0.3.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "notify-debouncer-full" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0m31ad5wv0lhrncn6qqk4zmryf0fl9h1j9kzrx89p2rlkjsxmxa9")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-crossbeam-channel" ,rust-crossbeam-channel-0.5) + ("rust-file-id" ,rust-file-id-0.2) + ("rust-log" ,rust-log-0.4) + ("rust-notify" ,rust-notify-6) + ("rust-parking-lot" ,rust-parking-lot-0.12) + ("rust-walkdir" ,rust-walkdir-2)) + #:cargo-development-inputs + (("rust-deser-hjson" ,rust-deser-hjson-1) + ("rust-mock-instant" ,rust-mock-instant-0.3) + ("rust-pretty-assertions" ,rust-pretty-assertions-1) + ("rust-rand" ,rust-rand-0.8) + ("rust-rstest" ,rust-rstest-0.17) + ("rust-serde" ,rust-serde-1)))) + (home-page "https://github.com/notify-rs/notify") + (synopsis "Notify event debouncer optimized for ease of use") + (description + "This package provides a notify event debouncer optimized for ease of use.") + (license (list license:expat license:asl2.0)))) + (define-public rust-notmuch-0.8 (package (name "rust-notmuch") @@ -42148,6 +47067,27 @@ notification library.") ("rust-maildir" ,rust-maildir-0.5) ("rust-tempfile" ,rust-tempfile-3)))))) +(define-public rust-now-0.1 + (package + (name "rust-now") + (version "0.1.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "now" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1l135786rb43rjfhwfdj7hi3b5zxxyl9gwf15yjz18cp8f3yk2bd")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-chrono" ,rust-chrono-0.4)) + #:cargo-development-inputs (("rust-cargo-husky" ,rust-cargo-husky-1) + ("rust-criterion" ,rust-criterion-0.4)))) + (home-page "https://github.com/Kilerd/now") + (synopsis "Time toolkit for chrono") + (description "This package provides a time toolkit for chrono.") + (license license:expat))) + (define-public rust-ntapi-0.4 (package (name "rust-ntapi") @@ -42421,14 +47361,14 @@ macros used in ntest.") (define-public rust-num-0.4 (package (name "rust-num") - (version "0.4.1") + (version "0.4.2") (source (origin (method url-fetch) (uri (crate-uri "num" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1bz7kvj94pyw4zi1pm7knziljzii218sw79ap8qfb81xkvb80ldh")))) + (base32 "0hbaawqgb3gsmx2i94ygbhc7nyqi6a30zbpja453n43xya5b0d9i")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -42681,17 +47621,36 @@ Rust.") ("rust-rand-xorshift" ,rust-rand-xorshift-0.3) ("rust-serde-test" ,rust-serde-test-1)))))) +(define-public rust-num-cmp-0.1 + (package + (name "rust-num-cmp") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "num-cmp" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1alavi36shn32b3cwbmkncj1wal3y3cwzkm21bxy5yil5hp5ncv3")))) + (build-system cargo-build-system) + (home-page "https://github.com/lifthrasiir/num-cmp") + (synopsis "Comparison between differently typed numbers") + (description + "This crate provides tools for comparison between differently typed +numbers.") + (license (list license:expat license:asl2.0)))) + (define-public rust-num-complex-0.4 (package (name "rust-num-complex") - (version "0.4.4") + (version "0.4.6") (source (origin (method url-fetch) (uri (crate-uri "num-complex" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "051j73vvdj07kdlpqv056s3a50ragsx3183cbpl1shc51355g88v")))) + (base32 "15cla16mnw12xzf5g041nxbjjm9m85hdgadd5dl5d0b30w9qmy3k")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -42768,6 +47727,26 @@ Rust.") ("rust-rustc-serialize" ,rust-rustc-serialize-0.3) ("rust-serde" ,rust-serde-0.8)))))) +(define-public rust-num-conv-0.1 + (package + (name "rust-num-conv") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "num-conv" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1ndiyg82q73783jq18isi71a7mjh56wxrk52rlvyx0mi5z9ibmai")))) + (build-system cargo-build-system) + (home-page "https://github.com/jhpratt/num-conv") + (synopsis "Convert between integer types") + (description + "@code{num_conv} is a crate to convert between integer types without using +@code{as} casts. This provides better certainty when refactoring, makes the +exact behavior of code more explicit, and allows using turbofish syntax.") + (license (list license:expat license:asl2.0)))) + (define-public rust-num-cpus-1 (package (name "rust-num-cpus") @@ -43066,7 +48045,7 @@ directly.") (define-public rust-num-integer-0.1 (package (name "rust-num-integer") - (version "0.1.45") + (version "0.1.46") (source (origin (method url-fetch) @@ -43074,7 +48053,7 @@ directly.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1ncwavvwdmsqzxnn65phv6c6nn72pnv9xhpmjd6a429mzf4k6p92")))) + "13w5g54a9184cqlbsq80rnxw4jj4s0d8wv75jsq5r2lms8gncsbr")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -43090,7 +48069,7 @@ directly.") (define-public rust-num-iter-0.1 (package (name "rust-num-iter") - (version "0.1.43") + (version "0.1.45") (source (origin (method url-fetch) @@ -43098,7 +48077,7 @@ directly.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0lp22isvzmmnidbq9n5kbdh8gj0zm3yhxv1ddsn5rp65530fc0vx")))) + "1gzm7vc5g9qsjjl3bqk9rz1h6raxhygbrcpbfl04swlh0i506a8l")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -43225,14 +48204,14 @@ number of running threads for the current process.") (define-public rust-num-traits-0.2 (package (name "rust-num-traits") - (version "0.2.17") + (version "0.2.19") (source (origin (method url-fetch) (uri (crate-uri "num-traits" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0z16bi5zwgfysz6765v3rd6whfbjpihx3mhsn4dg8dzj2c221qrr")))) + (base32 "0h984rhdkkqd4ny9cif7y2azl3xdfb7768hb9irhpsch4q3gq787")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -43301,8 +48280,40 @@ giga, kibi.") giga, kibi.") (license license:expat))) +(define-public rust-numtoa-0.2 + (package + (name "rust-numtoa") + (version "0.2.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "numtoa" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "03yhkhjb3d1zx22m3pgcbpk8baj0zzvaxqc25c584sdq77jw98ka")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-test-flags + '("--release" "--" + "--skip=base10_i128_array_too_small" + "--skip=base10_i16_array_too_small" + "--skip=base10_i32_array_too_small" + "--skip=base10_i64_array_too_small" + "--skip=base10_i8_array_too_small" + "--skip=base10_u128_array_too_small" + "--skip=base10_u16_array_too_small" + "--skip=base10_u32_array_too_small" + "--skip=base10_u64_array_too_small" + "--skip=base10_u8_array_too_small"))) + (home-page "https://gitlab.com/mmstick/numtoa") + (synopsis "Convert numbers into stack-allocated byte arrays") + (description + "This package can convert numbers into stack-allocated byte arrays.") + (license (list license:expat license:asl2.0)))) + (define-public rust-numtoa-0.1 (package + (inherit rust-numtoa-0.2) (name "rust-numtoa") (version "0.1.0") (source @@ -43313,13 +48324,41 @@ giga, kibi.") (sha256 (base32 "1vs9rhggqbql1p26x8nkha1j06wawwgb2jp5fs88b5gi7prvvy5q")))) + (arguments '(#:tests? #f)))) + +(define-public rust-oauth2-types-0.7 + (package + (name "rust-oauth2-types") + (version "0.7.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "oauth2-types" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "08pis87992xd6gj072k4kr4inlaaviq6as5h65pnjmk86siky37x")))) (build-system cargo-build-system) - (arguments '(#:tests? #f)) - (home-page "https://gitlab.com/mmstick/numtoa") - (synopsis "Convert numbers into stack-allocated byte arrays") - (description - "This package can convert numbers into stack-allocated byte arrays.") - (license (list license:expat license:asl2.0)))) + (arguments + `(#:cargo-inputs (("rust-chrono" ,rust-chrono-0.4) + ("rust-data-encoding" ,rust-data-encoding-2) + ("rust-http" ,rust-http-0.2) + ("rust-language-tags" ,rust-language-tags-0.3) + ("rust-mas-iana" ,rust-mas-iana-0.7) + ("rust-mas-jose" ,rust-mas-jose-0.7) + ("rust-parse-display" ,rust-parse-display-0.8) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-serde-with" ,rust-serde-with-3) + ("rust-sha2" ,rust-sha2-0.10) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-url" ,rust-url-2)) + #:cargo-development-inputs + (("rust-assert-matches" ,rust-assert-matches-1)))) + (home-page "https://matrix-org.github.io/matrix-authentication-service/") + (synopsis "OAuth 2.0 types used by the Matrix Authentication Service") + (description "This package provides OAuth 2.0 types used by the Matrix +Authentication Service.") + (license license:asl2.0))) (define-public rust-obfstr-0.3 (package @@ -43384,8 +48423,44 @@ form and deobfuscated locally.") "This package provides a package for loading Wavefront @code{.obj} files.") (license license:asl2.0))) +(define-public rust-object-0.32 + (package + (name "rust-object") + (version "0.32.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "object" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0hc4cjwyngiy6k51hlzrlsxgv5z25vv7c2cp0ky1lckfic0259m6")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-test-flags + '("--release" "--" + ;; Not all files are included + "--skip=read::coff::coff_extended_relocations") + #:cargo-inputs + (("rust-compiler-builtins" ,rust-compiler-builtins-0.1) + ("rust-crc32fast" ,rust-crc32fast-1) + ("rust-flate2" ,rust-flate2-1) + ("rust-hashbrown" ,rust-hashbrown-0.14) + ("rust-indexmap" ,rust-indexmap-2) + ("rust-memchr" ,rust-memchr-2) + ("rust-rustc-std-workspace-alloc" ,rust-rustc-std-workspace-alloc-1) + ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1) + ("rust-ruzstd" ,rust-ruzstd-0.5) + ("rust-wasmparser" ,rust-wasmparser-0.118)))) + (home-page "https://github.com/gimli-rs/object") + (synopsis "Unified interface for reading and writing object file formats") + (description + "This package provides a unified interface for reading and writing object +file formats.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-object-0.30 (package + (inherit rust-object-0.32) (name "rust-object") (version "0.30.3") (source (origin @@ -43395,7 +48470,6 @@ form and deobfuscated locally.") (sha256 (base32 "0fdl7qjsz1j9kl3j7f4656fswzrqpyj2kgaizhknmjrx7mfjd1pa")))) - (build-system cargo-build-system) (arguments `(#:cargo-test-flags '("--release" "--" @@ -43410,13 +48484,7 @@ form and deobfuscated locally.") ("rust-memchr" ,rust-memchr-2) ("rust-rustc-std-workspace-alloc" ,rust-rustc-std-workspace-alloc-1) ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1) - ("rust-wasmparser" ,rust-wasmparser-0.57)))) - (home-page "https://github.com/gimli-rs/object") - (synopsis "Unified interface for reading and writing object file formats") - (description - "This package provides a unified interface for reading and writing object -file formats.") - (license (list license:asl2.0 license:expat)))) + ("rust-wasmparser" ,rust-wasmparser-0.57)))))) (define-public rust-object-0.29 (package @@ -43507,6 +48575,54 @@ file formats.") ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1) ("rust-wasmparser" ,rust-wasmparser-0.57)))))) +(define-public rust-object-store-0.9 + (package + (name "rust-object-store") + (version "0.9.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "object_store" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1cwx0xg57cp3z6xjgrqwp0gxgxsagls4h5cd212pmxpxcn5qywdq")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-async-trait" ,rust-async-trait-0.1) + ("rust-base64" ,rust-base64-0.21) + ("rust-bytes" ,rust-bytes-1) + ("rust-chrono" ,rust-chrono-0.4) + ("rust-futures" ,rust-futures-0.3) + ("rust-humantime" ,rust-humantime-2) + ("rust-hyper" ,rust-hyper-0.14) + ("rust-itertools" ,rust-itertools-0.12) + ("rust-md-5" ,rust-md-5-0.10) + ("rust-parking-lot" ,rust-parking-lot-0.12) + ("rust-percent-encoding" ,rust-percent-encoding-2) + ("rust-quick-xml" ,rust-quick-xml-0.31) + ("rust-rand" ,rust-rand-0.8) + ("rust-reqwest" ,rust-reqwest-0.11) + ("rust-ring" ,rust-ring-0.17) + ("rust-rustls-pemfile" ,rust-rustls-pemfile-2) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-snafu" ,rust-snafu-0.7) + ("rust-tokio" ,rust-tokio-1) + ("rust-tracing" ,rust-tracing-0.1) + ("rust-url" ,rust-url-2) + ("rust-walkdir" ,rust-walkdir-2)) + #:cargo-development-inputs (("rust-futures-test" ,rust-futures-test-0.3) + ("rust-hyper" ,rust-hyper-0.14) + ("rust-nix" ,rust-nix-0.28) + ("rust-rand" ,rust-rand-0.8) + ("rust-tempfile" ,rust-tempfile-3)))) + (home-page "https://github.com/apache/arrow-rs/tree/master/object_store") + (synopsis "Generic object store interface") + (description "This package provides a generic object store interface for +uniformly interacting with AWS S3, Google Cloud Storage, Azure Blob Storage and +local files.") + (license (list license:expat license:asl2.0)))) + (define-public rust-oboe-0.4 (package (name "rust-oboe") @@ -43558,6 +48674,56 @@ file formats.") "Unsafe bindings for oboe an android library for low latency audio IO.") (license license:asl2.0))) +(define-public rust-odbc-api-0.36 + (package + (name "rust-odbc-api") + (version "0.36.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "odbc-api" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "04xcqqhm7w24b1gj6v4b24z9j65r1zzyxjadlv3xf73fm92cmnd3")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; Tests expect a running odbc server. + #:cargo-inputs (("rust-force-send-sync" ,rust-force-send-sync-1) + ("rust-log" ,rust-log-0.4) + ("rust-odbc-sys" ,rust-odbc-sys-0.21) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-widestring" ,rust-widestring-0.5) + ("rust-winit" ,rust-winit-0.26)) + #:cargo-development-inputs (("rust-anyhow" ,rust-anyhow-1) + ("rust-csv" ,rust-csv-1) + ("rust-env-logger" ,rust-env-logger-0.9) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-tempfile" ,rust-tempfile-3) + ("rust-test-case" ,rust-test-case-2)))) + (inputs (list unixodbc)) + (home-page "https://github.com/pacman82/odbc-api") + (synopsis "Write ODBC Applications in (mostly) safe Rust") + (description "Write ODBC Applications in (mostly) safe Rust.") + (license license:expat))) + +(define-public rust-odbc-sys-0.21 + (package + (name "rust-odbc-sys") + (version "0.21.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "odbc-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "024gylzq3q7s6b10qhbb8cjis6aj8a83jay553jdsiwgwm65qb2r")))) + (build-system cargo-build-system) + (inputs (list unixodbc)) + (home-page "https://github.com/pacman82/odbc-sys") + (synopsis "ODBC FFI bindings") + (description "This package provides ODBC FFI bindings.") + (license license:expat))) + (define-public rust-odds-0.3 (package (name "rust-odds") @@ -43642,6 +48808,23 @@ Things in odds may move to more appropriate crates if we find them.") spec in pure Rust.") (license license:expat))) +(define-public rust-omnipath-0.1 + (package + (name "rust-omnipath") + (version "0.1.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "omnipath" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0xd5a4xwsfmhzk59v6wz65f59rk16d7gvkg90w1qhb0jg08b7bc0")))) + (build-system cargo-build-system) + (home-page "https://github.com/ChrisDenton/omnipath") + (synopsis "Path utility library") + (description "This package provides a path utility library.") + (license (list license:expat license:asl2.0)))) + (define-public rust-onig-6 (package (name "rust-onig") @@ -43781,21 +48964,22 @@ contents.") (base32 "02942l2gc7w5r4js7i9063x99szic5mzzk1055j83v4diqpbpxck")))))) -(define-public rust-open-3 +(define-public rust-open-5 (package (name "rust-open") - (version "3.2.0") + (version "5.1.2") (source (origin (method url-fetch) (uri (crate-uri "open" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1y3nhpgh444ns5vqy87jbcnlryqmw62akyi85k2a0m3akq1w0y10")))) + (base32 "0ciy22dh82rdgmmsiai2wksx7sj9abb4ddnmxpqxnpfqapw0z7s4")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs (("rust-pathdiff" ,rust-pathdiff-0.2) - ("rust-windows-sys" ,rust-windows-sys-0.42)))) + `(#:cargo-inputs (("rust-is-wsl" ,rust-is-wsl-0.4) + ("rust-libc" ,rust-libc-0.2) + ("rust-pathdiff" ,rust-pathdiff-0.2)))) (home-page "https://github.com/Byron/open-rs") (synopsis "Open a path or URL using the program configured on the system") (description @@ -43803,23 +48987,55 @@ contents.") the system.") (license license:expat))) +(define-public rust-open-4 + (package + (inherit rust-open-5) + (name "rust-open") + (version "4.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "open" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "04kw6xmsjm0wdqidjndhpzl79iksyrhwyik32z28wjjygq63q21s")))) + (arguments + `(#:cargo-inputs (("rust-is-wsl" ,rust-is-wsl-0.4) + ("rust-libc" ,rust-libc-0.2) + ("rust-pathdiff" ,rust-pathdiff-0.2)))))) + +(define-public rust-open-3 + (package + (inherit rust-open-4) + (name "rust-open") + (version "3.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "open" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1y3nhpgh444ns5vqy87jbcnlryqmw62akyi85k2a0m3akq1w0y10")))) + (arguments + `(#:cargo-inputs (("rust-pathdiff" ,rust-pathdiff-0.2) + ("rust-windows-sys" ,rust-windows-sys-0.42)))))) + (define-public rust-open-2 (package (inherit rust-open-3) (name "rust-open") - (version "2.0.2") + (version "2.1.3") (source (origin (method url-fetch) (uri (crate-uri "open" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1dq9c6dgq7iv5kvqfk8gvkfq34j5pdinfcs1hbdd4x6i62vf8vhp")))) + (base32 "137r49qinkxvw85z2cjlz03ds8w9jrakcm5iqdc2xf25ykxkyhpj")))) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-pathdiff" ,rust-pathdiff-0.2) - ("rust-winapi" ,rust-winapi-0.3)))))) + ("rust-windows-sys" ,rust-windows-sys-0.36)))))) (define-public rust-open-1 (package @@ -43946,14 +49162,14 @@ crate.") (define-public rust-openssl-0.10 (package (name "rust-openssl") - (version "0.10.57") + (version "0.10.64") (source (origin (method url-fetch) (uri (crate-uri "openssl" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0z0f8g84y0lvnbc60586ibjpf8r1q1dv672vfqan5d5bk7imxhms")) + "07vb455yh08qh3n493ssw1qsa3zg3zfj438kk2180453hq94i84m")) (snippet #~(begin (use-modules (guix build utils)) (substitute* "Cargo.toml" @@ -44039,14 +49255,14 @@ system for OpenSSL.") (define-public rust-openssl-sys-0.9 (package (name "rust-openssl-sys") - (version "0.9.93") + (version "0.9.101") (source (origin (method url-fetch) (uri (crate-uri "openssl-sys" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "078vnn4s18kj8m5sd7b684frhjnxjcjc9z7s7h4871s7q2j5ckfv")) + (base32 "1zwd35nc5bq7m26vjsmja4hxf3fzk389blgpmhpzr3p78krv18nx")) (snippet #~(begin (use-modules (guix build utils)) @@ -44054,12 +49270,15 @@ system for OpenSSL.") (substitute* "Cargo.toml.orig" (("vendored = .*") "vendored = []\n") ((".*bssl.*") "") - ((".*openssl-src.*") "")) + ((".*openssl-src.*") "") + ;; Allow any version of bindgen. + (("(bindgen = \\{ version =) \".*\"," _ bindgen) + (string-append bindgen "\"*\","))) (copy-file "Cargo.toml.orig" "Cargo.toml"))))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-bindgen" ,rust-bindgen-0.64) + (("rust-bindgen" ,rust-bindgen-0.69) ("rust-cc" ,rust-cc-1) ("rust-libc" ,rust-libc-0.2) ("rust-pkg-config" ,rust-pkg-config-0.3) @@ -44137,6 +49356,34 @@ system for OpenSSL.") "Extra FFI bindings to OpenSSL that require a C shim.") (license license:expat))) +(define-public rust-opentelemetry-0.21 + (package + (name "rust-opentelemetry") + (version "0.21.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "opentelemetry" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "12jfmyx8k9q2sjlx4wp76ddzaf94i7lnkliv1c9mj164bnd36chy")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-futures-core" ,rust-futures-core-0.3) + ("rust-futures-sink" ,rust-futures-sink-0.3) + ("rust-indexmap" ,rust-indexmap-2) + ("rust-js-sys" ,rust-js-sys-0.3) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-pin-project-lite" ,rust-pin-project-lite-0.2) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-urlencoding" ,rust-urlencoding-2)))) + (home-page "https://github.com/open-telemetry/opentelemetry-rust") + (synopsis "Metrics collection and distributed tracing framework") + (description + "This package provides a metrics collection and distributed tracing +framework.") + (license license:asl2.0))) + (define-public rust-opml-1 (package (name "rust-opml") @@ -44300,6 +49547,29 @@ usability when dealing with Rust Options.") "This package provides the Orbital Client Library, used for RedoxOS.") (license license:expat))) +(define-public rust-orc-format-0.3 + (package + (name "rust-orc-format") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "orc-format" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "02qzqhy1zx9bmylvkmbjrc2mxyddjgn2sqiwwd7kr9zh2p7jsaj0")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; Not all files included. + #:cargo-inputs + (("rust-fallible-streaming-iterator" ,rust-fallible-streaming-iterator-0.1) + ("rust-flate2" ,rust-flate2-1) + ("rust-prost" ,rust-prost-0.9)))) + (home-page "https://github.com/DataEngineeringLabs/orc-format") + (synopsis "Unofficial implementation of Apache ORC spec in safe Rust") + (description "Unofficial implementation of Apache ORC spec in safe Rust.") + (license (list license:expat license:asl2.0)))) + (define-public rust-ord-subset-3 (package (name "rust-ord-subset") @@ -44321,18 +49591,48 @@ usability when dealing with Rust Options.") PartialOrd types, like floats.") (license (list license:expat license:asl2.0)))) +(define-public rust-ordered-float-4 + (package + (name "rust-ordered-float") + (version "4.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "ordered-float" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0kjqcvvbcsibbx3hnj7ag06bd9gv2zfi5ja6rgyh2kbxbh3zfvd7")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-arbitrary" ,rust-arbitrary-1) + ("rust-borsh" ,rust-borsh-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)) + #: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))) + (define-public rust-ordered-float-3 (package + (inherit rust-ordered-float-4) (name "rust-ordered-float") - (version "3.4.0") + (version "3.9.2") (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) + "1p3jkxlz89ndm4lmwr2n5kdnckhm5pcmqqkihkag259dff8c7qgi")))) (arguments `(#:cargo-inputs (("rust-arbitrary" ,rust-arbitrary-1) ("rust-bytemuck" ,rust-bytemuck-1) @@ -44342,32 +49642,30 @@ PartialOrd types, like floats.") ("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))) + ("rust-speedy" ,rust-speedy-0.8)) + #:cargo-development-inputs (("rust-serde-test" ,rust-serde-test-1)))))) (define-public rust-ordered-float-2 (package (inherit rust-ordered-float-3) (name "rust-ordered-float") - (version "2.1.1") + (version "2.10.1") (source (origin (method url-fetch) (uri (crate-uri "ordered-float" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0632g8bacvras6nig1bb1ihgc560476jkrb3is6n542ll86q8vvn")))) + "075i108hr95pr7hy4fgxivib5pky3b6b22rywya5qyd2wmkrvwb8")))) (arguments - `(#:skip-build? - #t - #:cargo-inputs - (("rust-num-traits" ,rust-num-traits-0.2) + `(#:cargo-inputs + (("rust-arbitrary" ,rust-arbitrary-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.6) ("rust-serde" ,rust-serde-1)) #:cargo-development-inputs (("rust-serde-test" ,rust-serde-test-1)))))) @@ -44376,19 +49674,45 @@ PartialOrd types, like floats.") (package (inherit rust-ordered-float-2) (name "rust-ordered-float") - (version "1.0.2") + (version "1.1.1") (source (origin (method url-fetch) (uri (crate-uri "ordered-float" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0625x96987kspdxbikry5mb7hsf5pdc5bbanxd8wjwqlx0ar71hq")))))) + "1drp3v9jsm1mn0wqp4p5y19j3bmz3w5rw4yxzi39zlld4wssy19k")))) + (arguments + `(#:cargo-inputs (("rust-num-traits" ,rust-num-traits-0.2) + ("rust-serde" ,rust-serde-1)) + #:cargo-development-inputs (("rust-serde-test" ,rust-serde-test-1)))))) + +(define-public rust-ordered-multimap-0.4 + (package + (name "rust-ordered-multimap") + (version "0.4.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "ordered-multimap" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0jljv1257pfyf855jlwwas5mqkzk40b9lqfx40f73qbpf7ildmyc")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-dlv-list" ,rust-dlv-list-0.3) + ("rust-hashbrown" ,rust-hashbrown-0.12) + ("rust-serde" ,rust-serde-1)))) + (home-page "https://github.com/sgodwincs/ordered-multimap-rs") + (synopsis "Insertion ordered multimap") + (description "This crate provides a multimap type object that maintains +insertion order across all keys and values.") + (license license:expat))) (define-public rust-ordered-multimap-0.3 (package + (inherit rust-ordered-multimap-0.4) (name "rust-ordered-multimap") (version "0.3.1") (source @@ -44398,18 +49722,12 @@ PartialOrd types, like floats.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "1194q7sb2d6chbllsn7237dhhvx04iqr3sq0ii16w1pcv5x2qrqw")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-dlv-list" ,rust-dlv-list-0.2) ("rust-hashbrown" ,rust-hashbrown-0.9) - ("rust-serde" ,rust-serde-1)))) - (home-page "https://github.com/sgodwincs/ordered-multimap-rs") - (synopsis "Insertion ordered multimap") - (description "This crate provides a multimap type object that maintains -insertion order across all keys and values.") - (license license:expat))) + ("rust-serde" ,rust-serde-1)))))) (define-public rust-ordered-stream-0.2 (package @@ -44519,6 +49837,25 @@ under its new name.") "This package provides a Rust library for parsing orgmode files.") (license license:expat))) +(define-public rust-os-display-0.1 + (package + (name "rust-os-display") + (version "0.1.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "os_display" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0xfgfqvfg5nyidv5p85fb87l0mif1nniisxarw6npd4jv2x2jqks")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-unicode-width" ,rust-unicode-width-0.1)))) + (home-page "https://github.com/blyxxyz/os_display") + (synopsis "Display strings in a safe platform-appropriate way") + (description "Display strings in a safe platform-appropriate way.") + (license license:expat))) + (define-public rust-os-info-3 (package (name "rust-os-info") @@ -44548,19 +49885,19 @@ under its new name.") (define-public rust-os-pipe-1 (package (name "rust-os-pipe") - (version "1.1.4") + (version "1.1.5") (source (origin (method url-fetch) (uri (crate-uri "os_pipe" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0xy1igr1jfd9ijhr4sccvl8mzp0jic7njdmr56lsk3220ym5ks0a")))) + (base32 "1fcgfg3ddnsh6vfhkk579p7z786kh1khb1dar4g4k1iri4xrq4ap")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2) - ("rust-windows-sys" ,rust-windows-sys-0.48)))) + ("rust-windows-sys" ,rust-windows-sys-0.52)))) (native-inputs (list python-minimal-wrapper)) ; For the tests. (home-page "https://github.com/oconnor663/os_pipe.rs") @@ -44866,14 +50203,16 @@ owo.") (package (inherit rust-owo-colors-4) (name "rust-owo-colors") - (version "3.6.0") + (version "3.5.0") (source (origin (method url-fetch) (uri (crate-uri "owo-colors" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0943lynkwz1glq3w7m9anv73lnrhd8yabs09krbh49g1wz4lxp39")))))) + "0vyvry6ba1xmpd45hpi6savd8mbx09jpmvnnwkf6z62pk6s4zc61")))) + (arguments + `(#:cargo-inputs (("rust-supports-color" ,rust-supports-color-1)))))) (define-public rust-owned-ttf-parser-0.6 (package @@ -45239,6 +50578,31 @@ sequence alignment library.") executable.") (license (list license:expat license:asl2.0)))) +(define-public rust-papergrid-0.10 + (package + (name "rust-papergrid") + (version "0.10.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "papergrid" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1j6hhk8lgzz53rzrlpxqrsq9gqi7cis445l7m7wn5nxny8avxk52")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; use of undeclared crate or module `testing_table` + #:cargo-inputs (("rust-ansi-str" ,rust-ansi-str-0.8) + ("rust-ansitok" ,rust-ansitok-0.2) + ("rust-bytecount" ,rust-bytecount-0.6) + ("rust-fnv" ,rust-fnv-1) + ("rust-unicode-width" ,rust-unicode-width-0.1)) + #:cargo-development-inputs (("rust-owo-colors" ,rust-owo-colors-3)))) + (home-page "https://github.com/zhiburt/tabled") + (synopsis "Core library to print a table") + (description "Papergrid is a core library to print a table.") + (license license:expat))) + (define-public rust-parasailors-0.3 (package (name "rust-parasailors") @@ -45583,14 +50947,14 @@ synchronization primitives.") (define-public rust-parking-lot-core-0.9 (package (name "rust-parking-lot-core") - (version "0.9.8") + (version "0.9.9") (source (origin (method url-fetch) (uri (crate-uri "parking_lot_core" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0ixlak319bpzldq20yvyfqk0y1vi736zxbw101jvzjp7by30rw4k")))) + "13h0imw1aq86wj28gxkblhkzx6z1gk8q18n0v76qmmj6cliajhjc")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -45598,10 +50962,10 @@ synchronization primitives.") ("rust-cfg-if" ,rust-cfg-if-1) ("rust-libc" ,rust-libc-0.2) ("rust-petgraph" ,rust-petgraph-0.6) - ("rust-redox-syscall" ,rust-redox-syscall-0.3) + ("rust-redox-syscall" ,rust-redox-syscall-0.4) ("rust-smallvec" ,rust-smallvec-1) ("rust-thread-id" ,rust-thread-id-4) - ("rust-windows-sys" ,rust-windows-sys-0.48)))) + ("rust-windows-targets" ,rust-windows-targets-0.48)))) (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 @@ -45611,7 +50975,7 @@ synchronization primitives.") (define-public rust-parking-lot-core-0.8 (package (name "rust-parking-lot-core") - (version "0.8.4") + (version "0.8.6") (source (origin (method url-fetch) @@ -45619,14 +50983,7 @@ synchronization primitives.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "08n7w09q6b2prvazbzgwrc9ml7aaf8yg3132ifsayrkwy1nwwzs6")) - (modules '((guix build utils))) - (snippet - '(begin - ;; XXX: The file demands 0.3.60; we have 0.3.56, but - ;; that works well, really. - (substitute* "Cargo.toml" - (("0\\.3\\.60") "0.3.56")))))) + "1p2nfcbr0b9lm9rglgm28k6mwyjwgm4knipsmqbgqaxdy3kcz8k0")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -45649,16 +51006,14 @@ synchronization primitives.") (package (inherit rust-parking-lot-core-0.8) (name "rust-parking-lot-core") - (version "0.7.2") + (version "0.7.3") (source (origin (method url-fetch) (uri (crate-uri "parking_lot_core" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "18s0cw5y32447c06fhg2mp3xfng22fn1h9fpx3il98sbimv7r36m")))) + (base32 "167wvxai4a5zhpy5zfgfbm5c566vfffjlr3fkrwkq21kn9mkhgxr")))) (arguments `(#:cargo-inputs (("rust-backtrace" ,rust-backtrace-0.3) @@ -45675,31 +51030,26 @@ synchronization primitives.") (package (inherit rust-parking-lot-core-0.7) (name "rust-parking-lot-core") - (version "0.6.2") + (version "0.6.3") (source (origin (method url-fetch) (uri (crate-uri "parking_lot_core" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "0ay67dpnrn68ryyvp720m9i8hzp189fd4d6slrs1lvmcwywv2xmq")))) + (base32 "02kbwqrr0w5mw0hkklqcg35aaiq1cck3g1w0d8bpbgk21a0np9mx")))) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-backtrace" ,rust-backtrace-0.3) ("rust-cfg-if" ,rust-cfg-if-0.1) ("rust-cloudabi" ,rust-cloudabi-0.0) ("rust-libc" ,rust-libc-0.2) ("rust-petgraph" ,rust-petgraph-0.4) - ("rust-rand" ,rust-rand-0.4) ("rust-redox-syscall" ,rust-redox-syscall-0.1) + ("rust-rustc-version" ,rust-rustc-version-0.2) ("rust-smallvec" ,rust-smallvec-0.6) ("rust-thread-id" ,rust-thread-id-3) - ("rust-winapi" ,rust-winapi-0.3)) - #:cargo-development-inputs - (("rust-rustc-version" ,rust-rustc-version-0.2)))))) + ("rust-winapi" ,rust-winapi-0.3)))))) (define-public rust-parking-lot-core-0.5 (package @@ -45826,8 +51176,70 @@ file and the generated @file{.rs} file.") definitions compiled to support read+write async.") (license license:asl2.0))) +(define-public rust-parquet-format-safe-0.2 + (package + (name "rust-parquet-format-safe") + (version "0.2.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "parquet-format-safe" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "07wf6wf4jrxlq5p3xldxsnabp7jl06my2qp7kiwy9m3x2r5wac8i")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-async-trait" ,rust-async-trait-0.1) + ("rust-futures" ,rust-futures-0.3)) + #:cargo-development-inputs (("rust-tokio" ,rust-tokio-1)))) + (home-page "https://github.com/jorgecarleitao/parquet-format-safe") + (synopsis "Safe Parquet and Thrift reader and writer (sync and async)") + (description "Safe Parquet and Thrift reader and writer (sync and async).") + (license (list license:expat license:asl2.0)))) + +(define-public rust-parquet2-0.17 + (package + (name "rust-parquet2") + (version "0.17.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "parquet2" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1kiv50rj44y6flsa2879wi4kwsfldwhyvgrnybaz7kh2bxsfb7sp")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; Not all files included. + #:cargo-inputs + (("rust-async-stream" ,rust-async-stream-0.3) + ("rust-brotli" ,rust-brotli-3) + ("rust-flate2" ,rust-flate2-1) + ("rust-futures" ,rust-futures-0.3) + ("rust-lz4" ,rust-lz4-1) + ("rust-lz4-flex" ,rust-lz4-flex-0.9) + ("rust-parquet-format-safe" ,rust-parquet-format-safe-0.2) + ("rust-seq-macro" ,rust-seq-macro-0.3) + ("rust-serde" ,rust-serde-1) + ("rust-snap" ,rust-snap-1) + ("rust-streaming-decompression" ,rust-streaming-decompression-0.1) + ("rust-xxhash-rust" ,rust-xxhash-rust-0.8) + ("rust-zstd" ,rust-zstd-0.12)) + #:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.4) + ("rust-rand" ,rust-rand-0.8) + ("rust-tokio" ,rust-tokio-1)))) + (native-inputs (list pkg-config)) + (inputs (list (list zstd "lib"))) + (home-page "https://github.com/jorgecarleitao/parquet2") + (synopsis "Safe implementation of Parquet IO") + (description + "Parquet2 is a re-write of the official Parquet crate with performance, +parallelism and safety in mind.") + (license license:asl2.0))) + (define-public rust-parquet2-0.6 (package + (inherit rust-parquet2-0.17) (name "rust-parquet2") (version "0.6.0") (source @@ -45837,7 +51249,6 @@ definitions compiled to support read+write async.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "0v9xc20wmn2r1pyaxqd8zf9vnschbf8r00c5kg9332fqrmadz0nv")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs @@ -45851,12 +51262,60 @@ definitions compiled to support read+write async.") ("rust-snap" ,rust-snap-1) ("rust-streaming-decompression" ,rust-streaming-decompression-0.1) ("rust-zstd" ,rust-zstd-0.9)))) - (home-page "https://crates.io/crates/parquet2") - (synopsis "Safe implementation of Parquet IO") + (native-inputs '()) + (inputs '()))) + +(define-public rust-parse-display-0.8 + (package + (name "rust-parse-display") + (version "0.8.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "parse-display" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0p5w8jmb05lp3s9m5crwp1fkmgnc49xh5wlpzvdfhlrbf849sl66")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-once-cell" ,rust-once-cell-1) + ("rust-parse-display-derive" ,rust-parse-display-derive-0.8) + ("rust-regex" ,rust-regex-1)))) + (home-page "https://github.com/frozenlib/parse-display") + (synopsis + "Procedural macro to implement Display and FromStr using common settings") (description - "Parquet2 is a re-write of the official Parquet crate with performance, -parallelism and safety in mind.") - (license license:asl2.0))) + "This package provides a procedural macro to implement @code{Display} and +@code{FromStr} using common settings.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-parse-display-derive-0.8 + (package + (name "rust-parse-display-derive") + (version "0.8.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "parse-display-derive" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0hgkhjnk0xlaixql207p7vvg41vyq7y7gdqdijh8vxysr297hlb8")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-once-cell" ,rust-once-cell-1) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-regex" ,rust-regex-1) + ("rust-regex-syntax" ,rust-regex-syntax-0.7) + ("rust-structmeta" ,rust-structmeta-0.2) + ("rust-syn" ,rust-syn-2)))) + (home-page "https://github.com/frozenlib/parse-display") + (synopsis + "Procedural macro to implement Display and FromStr using common settings") + (description + "This package provides a procedural macro to implement @code{Display} and +@code{FromStr} using common settings.") + (license (list license:expat license:asl2.0)))) (define-public rust-parse-zoneinfo-0.3 (package @@ -45984,14 +51443,14 @@ find a device path by its ID.") (define-public rust-pasetors-0.6 (package (name "rust-pasetors") - (version "0.6.7") + (version "0.6.8") (source (origin (method url-fetch) (uri (crate-uri "pasetors" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1h4li2j46hdy58dpnn5ji4z4b4clbr2a6689jmaqv409lfcmcxms")))) + "1fkdp4lya95nrkrds3i14288g4a85gxrlg8lnz8hs8zjcryd8dkb")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -46083,7 +51542,7 @@ Format (MCF).") (string-append ">=" version))))))) (arguments `(#:cargo-inputs - (("rust-base64ct" ,rust-base64ct-1.0.1) + (("rust-base64ct" ,rust-base64ct-1) ("rust-rand-core" ,rust-rand-core-0.6) ("rust-subtle" ,rust-subtle-2)))))) @@ -46231,25 +51690,41 @@ Format (MCF).") Rust with reasonable performance.") (license (list license:expat license:asl2.0)))) -(define-public rust-path-clean-0.1 +(define-public rust-path-clean-1 (package (name "rust-path-clean") - (version "0.1.0") + (version "1.0.1") (source (origin (method url-fetch) (uri (crate-uri "path-clean" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "1pcgqxw0mgg3ha5hi5xkjhyjf488bw5rw1g3qlr9awbq4szh3fpc")))) + (base32 "1vzwcrlz39rd94l89rppvkbsn7dvng449f1bnkyk3ayp43y9ld8p")))) (build-system cargo-build-system) + (arguments + `(#:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.2)))) (home-page "https://github.com/danreeves/path-clean") (synopsis "Rust implementation of cleanname or path.Clean") (description "This package provides a Rust implementation of cleanname or path.Clean.") (license (list license:expat license:asl2.0)))) +(define-public rust-path-clean-0.1 + (package + (inherit rust-path-clean-1) + (name "rust-path-clean") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "path-clean" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1pcgqxw0mgg3ha5hi5xkjhyjf488bw5rw1g3qlr9awbq4szh3fpc")))) + (arguments '()))) + (define-public rust-path-slash-0.2 (package (name "rust-path-slash") @@ -46296,8 +51771,45 @@ relative path from a provided base directory path to the provided path.") (license (list license:asl2.0 license:expat)))) +(define-public rust-pcap-1 + (package + (name "rust-pcap") + (version "1.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "pcap" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0ygzsi7v2x9ld5cb61dfg8jgifs2rln6qlknypzqjjnmfgy3bscr")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) + ("rust-errno" ,rust-errno-0.2) + ("rust-etherparse" ,rust-etherparse-0.13) + ("rust-futures" ,rust-futures-0.3) + ("rust-gat-std" ,rust-gat-std-0.1) + ("rust-libc" ,rust-libc-0.2) + ("rust-libloading" ,rust-libloading-0.6) + ("rust-pkg-config" ,rust-pkg-config-0.3) + ("rust-regex" ,rust-regex-1) + ("rust-tokio" ,rust-tokio-1) + ("rust-tun-tap" ,rust-tun-tap-0.1) + ("rust-windows-sys" ,rust-windows-sys-0.36)) + #:cargo-development-inputs (("rust-eui48" ,rust-eui48-1) + ("rust-mockall" ,rust-mockall-0.11) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-tempdir" ,rust-tempdir-0.3)))) + (inputs (list libpcap)) + (home-page "https://github.com/rust-pcap/pcap") + (synopsis "Packet capture API around (w)pcap") + (description + "This package provides a packet capture API around pcap/wpcap.") + (license (list license:expat license:asl2.0)))) + (define-public rust-pcap-0.7 (package + (inherit rust-pcap-1) (name "rust-pcap") (version "0.7.0") (source @@ -46308,7 +51820,6 @@ path.") (sha256 (base32 "14blflnbj87z3ajlj1hszsl6k7rwa338y4aw2yjm2j0xdpjvj4pr")))) (native-inputs (list libpcap)) - (build-system cargo-build-system) (arguments `(#:tests? #f ; can't find crate for `futures` #:cargo-inputs @@ -46318,11 +51829,7 @@ path.") ("rust-mio" ,rust-mio-0.6) ("rust-tokio-core" ,rust-tokio-core-0.1)) #:cargo-development-inputs - (("rust-tempdir" ,rust-tempdir-0.3)))) - (home-page "https://github.com/rust-pcap/pcap") - (synopsis "Packet capture API around pcap/wpcap") - (description "This package provides a packet capture API around pcap/wpcap.") - (license (list license:expat license:asl2.0)))) + (("rust-tempdir" ,rust-tempdir-0.3)))))) (define-public rust-pcap-sys-0.1 (package @@ -46470,27 +51977,43 @@ library.") pdqsort.") (license (list license:asl2.0 license:expat)))) -(define-public rust-pear-0.1 +(define-public rust-pear-0.2 (package (name "rust-pear") - (version "0.1.5") + (version "0.2.8") (source (origin (method url-fetch) (uri (crate-uri "pear" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "02lnp8c414z5ds0lskd4zxlalrjljzpkg8g6kizszij4h52sgprj")))) + (base32 "1j03s6m80iqldnm6jzh3k1fbyk0lxirx8bi4ivgq3k3sq7va1k2c")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-pear-codegen" ,rust-pear-codegen-0.1)))) + `(#:cargo-inputs (("rust-inlinable-string" ,rust-inlinable-string-0.1) + ("rust-pear-codegen" ,rust-pear-codegen-0.2) + ("rust-yansi" ,rust-yansi-1)))) (home-page "https://crates.io/crates/pear") (synopsis "Pear is a fruit") (description "This package provides a pear is a fruit.") (license (list license:expat license:asl2.0)))) +(define-public rust-pear-0.1 + (package + (inherit rust-pear-0.2) + (name "rust-pear") + (version "0.1.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "pear" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "02lnp8c414z5ds0lskd4zxlalrjljzpkg8g6kizszij4h52sgprj")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs (("rust-pear-codegen" ,rust-pear-codegen-0.1)))))) + (define-public rust-pear-codegen-0.2 (package (name "rust-pear-codegen") @@ -47212,16 +52735,16 @@ function data structures.") (package (inherit rust-phf-0.10) (name "rust-phf") - (version "0.9.1") + (version "0.9.0") (source (origin (method url-fetch) (uri (crate-uri "phf" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0sk9arhiv4hkg3hbmbxnpjvr0bffhyz7kpb2pn86mn6ia4c566xj")))) + "0dsgl8gqaia5lwg9sjlg4ccihn5dija2drg0gi2sjz1samkqpb5j")))) (arguments - `(#:tests? #f ; Doc tests fail. + `(#:tests? #f ; unresolved imports `phf::phf_map`, `phf::phf_set` #:cargo-inputs (("rust-phf-macros" ,rust-phf-macros-0.9) ("rust-phf-shared" ,rust-phf-shared-0.9) @@ -47316,14 +52839,14 @@ function data structures.") (package (inherit rust-phf-codegen-0.10) (name "rust-phf-codegen") - (version "0.9.1") + (version "0.9.0") (source (origin (method url-fetch) (uri (crate-uri "phf_codegen" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1q4r7mqisvzjz5fzfnr16nb5bxrj6xv32qnq1ds75xql783md31z")))) + "00q5chz1v9idglrzk5qbijjyr80sgibpbkq1skgnbvi2rw8xnfln")))) (arguments `(#:cargo-inputs (("rust-phf-generator" ,rust-phf-generator-0.9) @@ -47544,14 +53067,14 @@ function data structures.") (package (inherit rust-phf-macros-0.10) (name "rust-phf-macros") - (version "0.9.1") + (version "0.9.0") (source (origin (method url-fetch) (uri (crate-uri "phf_macros" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1rpc0jy5sfrk3ir87k2q0kk44a45nsrbwc131jmsi6f8hi3fqi7g")))) + "11mbi4x03gz7jnf4bg9fzxdxn6gd8ddkj29hms0dh3mmds9za1mp")))) (arguments `(#:cargo-inputs (("rust-phf-generator" ,rust-phf-generator-0.9) @@ -47562,7 +53085,7 @@ function data structures.") ("rust-syn" ,rust-syn-1) ("rust-unicase" ,rust-unicase-2)) #:cargo-development-inputs - (("rust-phf" ,rust-phf-0.9) + (("rust-phf" ,rust-phf-0.8) ("rust-trybuild" ,rust-trybuild-1) ("rust-unicase" ,rust-unicase-2)))))) @@ -47726,6 +53249,23 @@ function data structures.") "Support code shared by PHF libraries.") (license license:expat))) +(define-public rust-pico-args-0.5 + (package + (name "rust-pico-args") + (version "0.5.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "pico-args" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "05d30pvxd6zlnkg2i3ilr5a70v3f3z2in18m67z25vinmykngqav")))) + (build-system cargo-build-system) + (home-page "https://github.com/RazrFalcon/pico-args") + (synopsis "CLI arguments parser.") + (description "This package provides an ultra simple CLI arguments parser.") + (license license:expat))) + (define-public rust-pikchr-0.1 (package (name "rust-pikchr") @@ -47750,17 +53290,20 @@ function data structures.") (define-public rust-pin-project-1 (package (name "rust-pin-project") - (version "1.0.12") + (version "1.1.5") (source (origin (method url-fetch) (uri (crate-uri "pin-project" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1k3f9jkia3idxl2pqxamszwnl89dk52fa4jqj3p7zmmwnq4scadd")))) + (base32 "1cxl146x0q7lawp0m1826wsgj8mmmfs6ja8q7m6f7ff5j6vl7gxn")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs + ;; XXX: Tests fail with "error[E0433]: failed to resolve: use of + ;; undeclared crate or module `macrotest`". + `(#:tests? #false + #:cargo-inputs (("rust-pin-project-internal" ,rust-pin-project-internal-1)) #:cargo-development-inputs (("rust-macrotest" ,rust-macrotest-1) @@ -47826,21 +53369,21 @@ function data structures.") (define-public rust-pin-project-internal-1 (package (name "rust-pin-project-internal") - (version "1.0.12") + (version "1.1.5") (source (origin (method url-fetch) (uri (crate-uri "pin-project-internal" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0maa6icn7rdfy4xvgfaq7m7bwpw9f19wg76f1ncsiixd0lgdp6q6")))) + (base32 "0r9r4ivwiyqf45sv6b30l1dx282lxaax2f6gl84jwa3q590s8f1g")))) (build-system cargo-build-system) (arguments `(#:tests? #false #:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) ("rust-quote" ,rust-quote-1) - ("rust-syn" ,rust-syn-1)))) + ("rust-syn" ,rust-syn-2)))) (home-page "https://github.com/taiki-e/pin-project") (synopsis "Implementation detail of the @code{pin-project} crate") (description @@ -47961,6 +53504,25 @@ provides comprehensive coverage of that portion of the specification along with strong support for variations and the core header tables.") (license (list license:expat license:asl2.0)))) +(define-public rust-pipe-trait-0.4 + (package + (name "rust-pipe-trait") + (version "0.4.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "pipe-trait" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1ql988sa4appx60q0wfmn1d6i2qrk7vadvw4zsp600wzwp4ixgn1")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-development-inputs (("rust-futures" ,rust-futures-0.3)))) + (home-page "https://github.com/KSXGitHub/pipe-trait.git") + (synopsis "Make it possible to chain regular functions") + (description "This package makes it possible to chain regular functions.") + (license license:expat))) + (define-public rust-piper-0.2 (package (name "rust-piper") @@ -48096,6 +53658,29 @@ network packet formats.") (license (list license:asl2.0 license:expat)))) +(define-public rust-planus-0.3 + (package + (name "rust-planus") + (version "0.3.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "planus" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "17x8mr175b9clg998xpi5z45f9fsspb0ncfnx2644bz817fr25pw")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; use of undeclared crate or module `planus_example` + #:cargo-inputs (("rust-array-init-cursor" ,rust-array-init-cursor-0.2)) + #:cargo-development-inputs (("rust-rand" ,rust-rand-0.8)))) + (home-page "https://github.com/planus-org/planus") + (synopsis "Alternative compiler for flatbuffers") + (description + "Planus is an alternative compiler for flatbuffers, a cross platform +serialization library.") + (license (list license:expat license:asl2.0)))) + (define-public rust-platform-info-2 (package (name "rust-platform-info") @@ -48120,6 +53705,28 @@ network packet formats.") a system.") (license license:expat))) +(define-public rust-platforms-3 + (package + (name "rust-platforms") + (version "3.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "platforms" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0k7q6pigmnvgpfasvssb12m2pv3pc94zrhrfg9by3h3wmhyfqvb2")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-serde" ,rust-serde-1)))) + (home-page "https://rustsec.org") + (synopsis "Registry of valid Rust platforms from the Rust compiler") + (description + "This package provides a Rust platform registry with information +about valid Rust platforms (target triple, target_arch, target_os), +sourced from the Rust compiler.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-pledge-0.4 (package (name "rust-pledge") @@ -48174,30 +53781,53 @@ serialization.") (define-public rust-plotters-0.3 (package (name "rust-plotters") - (version "0.3.1") + (version "0.3.5") (source (origin (method url-fetch) (uri (crate-uri "plotters" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0akgmm5kqghl2b1q1qkzjggiqnb9smaz54fd5374k5qbqfggv8rj")))) + (base32 "0igxq58bx96gz58pqls6g3h80plf17rfl3b6bi6xvjnp02x29hnj")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t + `(#:cargo-test-flags + '("--release" "--" + ;; Not all files included. + "--skip=src/lib.rs - (line 310)" + "--skip=src/lib.rs - (line 458)" + "--skip=src/lib.rs - (line 480)" + "--skip=src/lib.rs - (line 508)" + "--skip=src/lib.rs - (line 534)" + "--skip=src/lib.rs - (line 576)") #:cargo-inputs - (("rust-chrono" ,rust-chrono-0.4) - ("rust-font-kit" ,rust-font-kit-0.10) - ("rust-image" ,rust-image-0.23) + (("rust-ab-glyph" ,rust-ab-glyph-0.2) + ("rust-chrono" ,rust-chrono-0.4) + ("rust-font-kit" ,rust-font-kit-0.11) + ("rust-image" ,rust-image-0.24) ("rust-lazy-static" ,rust-lazy-static-1) ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-once-cell" ,rust-once-cell-1) ("rust-pathfinder-geometry" ,rust-pathfinder-geometry-0.5) ("rust-plotters-backend" ,rust-plotters-backend-0.3) ("rust-plotters-bitmap" ,rust-plotters-bitmap-0.3) ("rust-plotters-svg" ,rust-plotters-svg-0.3) - ("rust-ttf-parser" ,rust-ttf-parser-0.12) + ("rust-ttf-parser" ,rust-ttf-parser-0.17) ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2) - ("rust-web-sys" ,rust-web-sys-0.3)))) + ("rust-web-sys" ,rust-web-sys-0.3)) + #:cargo-development-inputs + (("rust-criterion" ,rust-criterion-0.4) + ("rust-itertools" ,rust-itertools-0.10) + ("rust-rand" ,rust-rand-0.8) + ("rust-rand-distr" ,rust-rand-distr-0.4) + ("rust-rand-xorshift" ,rust-rand-xorshift-0.3) + ("rust-rayon" ,rust-rayon-1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-derive" ,rust-serde-derive-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3)))) + (native-inputs (list pkg-config)) + (inputs (list fontconfig)) (home-page "https://github.com/38/plotters") (synopsis "Rust drawing library focus on data plotting") (description @@ -48208,16 +53838,15 @@ both WASM and native applications") (define-public rust-plotters-backend-0.3 (package (name "rust-plotters-backend") - (version "0.3.2") + (version "0.3.5") (source (origin (method url-fetch) (uri (crate-uri "plotters-backend" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "075ccyz814q46dkr93zz7crj9mmyqgk0w6mmrpyz1sm0ilqig16q")))) + (base32 "02cn98gsj2i1bwrfsymifmyas1wn2gibdm9mk8w82x9s9n5n4xly")))) (build-system cargo-build-system) - (arguments `(#:skip-build? #t)) (home-page "https://plotters-rs.github.io") (synopsis "Plotters Backend API") (description "This package provides Plotters backend API.") @@ -48226,21 +53855,23 @@ both WASM and native applications") (define-public rust-plotters-bitmap-0.3 (package (name "rust-plotters-bitmap") - (version "0.3.1") + (version "0.3.3") (source (origin (method url-fetch) (uri (crate-uri "plotters-bitmap" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0m0bq3fqrnhgg37k6lz0m328n3ifymc965pxmqc5cpk90nljydi1")))) + (base32 "0hw5zd70l7q122np8m731sksclmv6m82k2wyqsmrjli0f0gvxsqc")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t + `(#:tests? #f ; use of undeclared crate or module `plotters` #:cargo-inputs - (("rust-gif" ,rust-gif-0.11) - ("rust-image" ,rust-image-0.23) - ("rust-plotters-backend" ,rust-plotters-backend-0.3)))) + (("rust-gif" ,rust-gif-0.12) + ("rust-image" ,rust-image-0.24) + ("rust-plotters-backend" ,rust-plotters-backend-0.3)) + #:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.4) + ("rust-rayon" ,rust-rayon-1)))) (home-page "https://plotters-rs.github.io") (synopsis "Plotters Bitmap Backend") (description "This package provides Plotters bitmap backend.") @@ -48249,19 +53880,20 @@ both WASM and native applications") (define-public rust-plotters-svg-0.3 (package (name "rust-plotters-svg") - (version "0.3.1") + (version "0.3.5") (source (origin (method url-fetch) (uri (crate-uri "plotters-svg" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1aavi3i4jrwydw3i6x0zxs3i3c7gki7jlhg9agff35x5ixisj7sj")))) + (base32 "1axbw82frs5di4drbyzihr5j35wpy2a75hp3f49p186cjfcd7xiq")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t + `(#:tests? #f ; use of undeclared crate or module `plotters` #:cargo-inputs - (("rust-plotters-backend" ,rust-plotters-backend-0.3)))) + (("rust-image" ,rust-image-0.24) + ("rust-plotters-backend" ,rust-plotters-backend-0.3)))) (home-page "https://plotters-rs.github.io") (synopsis "Plotters SVG backend") (description "This package provides Plotters SVG backend.") @@ -48314,80 +53946,128 @@ both WASM and native applications") (description "This package provides utils for proc-macro.") (license (list license:asl2.0 license:expat)))) -(define-public rust-pnet-base-0.27 +(define-public rust-pnet-base-0.34 (package (name "rust-pnet-base") - (version "0.27.2") + (version "0.34.0") (source (origin (method url-fetch) (uri (crate-uri "pnet_base" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1v8bcbv9jh581ill77qjzzw2ay76pl781982yclj3xky96m8hijf")))) + (base32 "0k2z3jh6vw99bwl0ckpsd142n4yiscza1bmj3b86i2xk7bxzck7y")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs - (("rust-serde" ,rust-serde-1)) - #:cargo-development-inputs - (("rust-serde-test" ,rust-serde-test-1)))) + `(#:cargo-inputs (("rust-no-std-net" ,rust-no-std-net-0.6) + ("rust-serde" ,rust-serde-1)) + #:cargo-development-inputs (("rust-serde-test" ,rust-serde-test-1)))) (home-page "https://github.com/libpnet/libpnet") - (synopsis "Fundamental base types and code used by pnet") + (synopsis "Fundamental base types and code used by pnet.") (description "This crate implements fundamental base types and code used by pnet.") (license (list license:expat license:asl2.0)))) -(define-public rust-pnet-datalink-0.27 +(define-public rust-pnet-base-0.27 (package - (name "rust-pnet-datalink") + (inherit rust-pnet-base-0.34) + (name "rust-pnet-base") (version "0.27.2") (source (origin (method url-fetch) + (uri (crate-uri "pnet_base" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1v8bcbv9jh581ill77qjzzw2ay76pl781982yclj3xky96m8hijf")))) + (arguments + `(#:cargo-inputs (("rust-serde" ,rust-serde-1)) + #:cargo-development-inputs (("rust-serde-test" ,rust-serde-test-1)))))) + +(define-public rust-pnet-datalink-0.34 + (package + (name "rust-pnet-datalink") + (version "0.34.0") + (source + (origin + (method url-fetch) (uri (crate-uri "pnet_datalink" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1iws7c2mf88ip43ccmr5p8r6kzb6lwsg3amgc4pvy8wx9nf1q02r")))) + (base32 "1zlq1z3y6flpqh0x2yqczxvzavwpr3mlazbzjv9vnzh6y2mm8n5d")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs - (("rust-ipnetwork" ,rust-ipnetwork-0.17) - ("rust-libc" ,rust-libc-0.2) - ("rust-netmap-sys" ,rust-netmap-sys-0.1) - ("rust-pcap" ,rust-pcap-0.7) - ("rust-pnet-base" ,rust-pnet-base-0.27) - ("rust-pnet-sys" ,rust-pnet-sys-0.27) - ("rust-serde" ,rust-serde-1) - ("rust-winapi" ,rust-winapi-0.3)))) + `(#:cargo-inputs (("rust-ipnetwork" ,rust-ipnetwork-0.20) + ("rust-libc" ,rust-libc-0.2) + ("rust-netmap-sys" ,rust-netmap-sys-0.1) + ("rust-pcap" ,rust-pcap-1) + ("rust-pnet-base" ,rust-pnet-base-0.34) + ("rust-pnet-sys" ,rust-pnet-sys-0.34) + ("rust-serde" ,rust-serde-1) + ("rust-winapi" ,rust-winapi-0.3)))) (home-page "https://github.com/libpnet/libpnet") (synopsis "Cross-platform, datalink layer networking") (description "This crate implements cross-platform, datalink layer networking.") (license (list license:expat license:asl2.0)))) -(define-public rust-pnet-sys-0.27 +(define-public rust-pnet-datalink-0.27 (package - (name "rust-pnet-sys") + (inherit rust-pnet-datalink-0.34) + (name "rust-pnet-datalink") (version "0.27.2") (source (origin (method url-fetch) + (uri (crate-uri "pnet_datalink" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1iws7c2mf88ip43ccmr5p8r6kzb6lwsg3amgc4pvy8wx9nf1q02r")))) + (arguments + `(#:cargo-inputs (("rust-ipnetwork" ,rust-ipnetwork-0.17) + ("rust-libc" ,rust-libc-0.2) + ("rust-netmap-sys" ,rust-netmap-sys-0.1) + ("rust-pcap" ,rust-pcap-0.7) + ("rust-pnet-base" ,rust-pnet-base-0.27) + ("rust-pnet-sys" ,rust-pnet-sys-0.27) + ("rust-serde" ,rust-serde-1) + ("rust-winapi" ,rust-winapi-0.3)))))) + +(define-public rust-pnet-sys-0.34 + (package + (name "rust-pnet-sys") + (version "0.34.0") + (source + (origin + (method url-fetch) (uri (crate-uri "pnet_sys" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "05gz5xixzvs5iw7a3l0r7sic7s44x8xmv9pqvzzs6wpdwz2f92bm")))) + (base32 "004d28vbaxv3m55cd741mpjm34031c3p2dpp8kazcwxms7n0nz21")))) (build-system cargo-build-system) (arguments `(#:tests? #f ; Tries to use sockets. - #:cargo-inputs - (("rust-libc" ,rust-libc-0.2) - ("rust-winapi" ,rust-winapi-0.3)))) + #:cargo-inputs (("rust-libc" ,rust-libc-0.2) + ("rust-winapi" ,rust-winapi-0.3)))) (home-page "https://github.com/libpnet/libpnet") (synopsis "Access to network related system functions") (description "This crate providess access to network related system function and calls.") (license (list license:expat license:asl2.0)))) +(define-public rust-pnet-sys-0.27 + (package + (inherit rust-pnet-sys-0.34) + (name "rust-pnet-sys") + (version "0.27.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "pnet_sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "05gz5xixzvs5iw7a3l0r7sic7s44x8xmv9pqvzzs6wpdwz2f92bm")))))) + (define-public rust-pocket-resources-0.3 (package (name "rust-pocket-resources") @@ -48407,8 +54087,42 @@ both WASM and native applications") applications.") (license license:expat))) +(define-public rust-polars-0.37 + (package + (name "rust-polars") + (version "0.37.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "polars" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0bv5w5abfqy5hmiblq6j4477d0wyfqbslz128lfqbjqhj329adz4")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-test-flags '("--release" "--lib" "--bins" "--tests" "--" + "--skip=io::csv::test_projection" + "--skip=io::csv::test_read_csv_file" + "--skip=io::csv::test_with_row_index") + #:cargo-inputs (("rust-getrandom" ,rust-getrandom-0.2) + ("rust-polars-core" ,rust-polars-core-0.37) + ("rust-polars-io" ,rust-polars-io-0.37) + ("rust-polars-lazy" ,rust-polars-lazy-0.37) + ("rust-polars-ops" ,rust-polars-ops-0.37) + ("rust-polars-plan" ,rust-polars-plan-0.37) + ("rust-polars-sql" ,rust-polars-sql-0.37) + ("rust-polars-time" ,rust-polars-time-0.37) + ("rust-version-check" ,rust-version-check-0.9)) + #:cargo-development-inputs (("rust-ahash" ,rust-ahash-0.8) + ("rust-rand" ,rust-rand-0.8)))) + (home-page "https://www.pola.rs/") + (synopsis "DataFrame library based on Apache Arrow") + (description "Polars is a @code{DataFrame} library based on Apache Arrow.") + (license license:expat))) + (define-public rust-polars-0.17 (package + (inherit rust-polars-0.37) (name "rust-polars") (version "0.17.0") (source @@ -48418,21 +54132,90 @@ applications.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "1655qd1khas4qm14k3hl3sh8zh2xaj505344qzm68fz98rfs553w")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-polars-core" ,rust-polars-core-0.17) ("rust-polars-io" ,rust-polars-io-0.17) - ("rust-polars-lazy" ,rust-polars-lazy-0.17)))) - (home-page "https://github.com/ritchie46/polars") - (synopsis "DataFrame Library based on Apache Arrow") + ("rust-polars-lazy" ,rust-polars-lazy-0.17)))))) + +(define-public rust-polars-arrow-0.37 + (package + (name "rust-polars-arrow") + (version "0.37.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "polars-arrow" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "03wvwh80cvs3gxdm9if6yfh2kq589538ssrdqx86vyj84ldd5b7s")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-test-flags + '("--release" "--" + "--skip=ffi::data::binview_nullable_buffered" + "--skip=ffi::data::binview_nullable_inlined") + #:cargo-inputs (("rust-ahash" ,rust-ahash-0.8) + ("rust-arrow-array" ,rust-arrow-array-47) + ("rust-arrow-buffer" ,rust-arrow-buffer-47) + ("rust-arrow-data" ,rust-arrow-data-47) + ("rust-arrow-schema" ,rust-arrow-schema-47) + ("rust-async-stream" ,rust-async-stream-0.3) + ("rust-atoi" ,rust-atoi-2) + ("rust-atoi-simd" ,rust-atoi-simd-0.15) + ("rust-avro-schema" ,rust-avro-schema-0.3) + ("rust-bytemuck" ,rust-bytemuck-1) + ("rust-chrono" ,rust-chrono-0.4) + ("rust-chrono-tz" ,rust-chrono-tz-0.8) + ("rust-dyn-clone" ,rust-dyn-clone-1) + ("rust-either" ,rust-either-1) + ("rust-ethnum" ,rust-ethnum-1) + ("rust-fast-float" ,rust-fast-float-0.2) + ("rust-foreign-vec" ,rust-foreign-vec-0.1) + ("rust-futures" ,rust-futures-0.3) + ("rust-getrandom" ,rust-getrandom-0.2) + ("rust-hashbrown" ,rust-hashbrown-0.14) + ("rust-hex" ,rust-hex-0.4) + ("rust-indexmap" ,rust-indexmap-2) + ("rust-itoa" ,rust-itoa-1) + ("rust-itoap" ,rust-itoap-1) + ("rust-lz4" ,rust-lz4-1) + ("rust-multiversion" ,rust-multiversion-0.7) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-polars-arrow-format" ,rust-polars-arrow-format-0.1) + ("rust-polars-error" ,rust-polars-error-0.37) + ("rust-polars-utils" ,rust-polars-utils-0.37) + ("rust-regex" ,rust-regex-1) + ("rust-regex-syntax" ,rust-regex-syntax-0.8) + ("rust-ryu" ,rust-ryu-1) + ("rust-serde" ,rust-serde-1) + ("rust-simdutf8" ,rust-simdutf8-0.1) + ("rust-streaming-iterator" ,rust-streaming-iterator-0.1) + ("rust-strength-reduce" ,rust-strength-reduce-0.2) + ("rust-version-check" ,rust-version-check-0.9) + ("rust-zstd" ,rust-zstd-0.13)) + #:cargo-development-inputs (("rust-apache-avro" ,rust-apache-avro-0.16) + ("rust-criterion" ,rust-criterion-0.5) + ("rust-crossbeam-channel" ,rust-crossbeam-channel-0.5) + ("rust-doc-comment" ,rust-doc-comment-0.3) + ("rust-flate2" ,rust-flate2-1) + ("rust-proptest" ,rust-proptest-1) + ("rust-rand" ,rust-rand-0.8) + ("rust-sample-arrow2" ,rust-sample-arrow2-0.17) + ("rust-sample-std" ,rust-sample-std-0.1) + ("rust-sample-test" ,rust-sample-test-0.1) + ("rust-tokio" ,rust-tokio-1) + ("rust-tokio-util" ,rust-tokio-util-0.7)))) + (home-page "https://www.pola.rs/") + (synopsis "Arrow interfaces for Polars DataFrame library") (description - "Polars is a dataframe Library based on Apache Arrow.") - (license license:expat))) + "This crate provides Arrow interfaces for Polars DataFrame library.") + (license (list license:asl2.0 license:expat)))) (define-public rust-polars-arrow-0.17 (package + (inherit rust-polars-arrow-0.37) (name "rust-polars-arrow") (version "0.17.0") (source @@ -48442,21 +54225,113 @@ applications.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "16aakfkiaqk71c3n3274r9ra44v0jrc8wwp5nqdr0srd5y6lii0w")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs (("rust-arrow2" ,rust-arrow2-0.7) ("rust-num" ,rust-num-0.4) - ("rust-thiserror" ,rust-thiserror-1)))) - (home-page "https://github.com/ritchie46/polars") - (synopsis "Arrow interfaces for Polars DataFrame library") + ("rust-thiserror" ,rust-thiserror-1)))))) + +(define-public rust-polars-arrow-format-0.1 + (package + (name "rust-polars-arrow-format") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "polars-arrow-format" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0k5qci66rcwqv4ycb43zlkk128wrdvcqkc95j2qrd4xgfhjfzc0r")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-planus" ,rust-planus-0.3) + ("rust-prost" ,rust-prost-0.11) + ("rust-prost-derive" ,rust-prost-derive-0.11) + ("rust-serde" ,rust-serde-1) + ("rust-tonic" ,rust-tonic-0.8)))) + (home-page "https://github.com/polar-rs/arrow-format") + (synopsis "Unofficial flatbuffers and tonic code of Apache Arrow spec") + (description "Unofficial flatbuffers and tonic code of Apache Arrow spec.") + (license (list license:asl2.0 license:expat)))) + +(define-public rust-polars-compute-0.37 + (package + (name "rust-polars-compute") + (version "0.37.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "polars-compute" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1p868zl3l4cn8kbdlyp1pf058d1a5g4rmbgmxvny0fh0z23xrn9j")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-bytemuck" ,rust-bytemuck-1) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-polars-arrow" ,rust-polars-arrow-0.37) + ("rust-polars-error" ,rust-polars-error-0.37) + ("rust-polars-utils" ,rust-polars-utils-0.37) + ("rust-version-check" ,rust-version-check-0.9)))) + (home-page "https://www.pola.rs/") + (synopsis "Private compute kernels for the Polars DataFrame library") + (description "This package provides private compute kernels for the Polars +@code{DataFrame} library.") + (license license:expat))) + +(define-public rust-polars-core-0.37 + (package + (name "rust-polars-core") + (version "0.37.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "polars-core" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0xvp3ppcsfd4z5j0qkarijcnbfnf349r0ksw0c0rl8c218l4vzdy")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-ahash" ,rust-ahash-0.8) + ("rust-arrow-array" ,rust-arrow-array-47) + ("rust-bitflags" ,rust-bitflags-2) + ("rust-bytemuck" ,rust-bytemuck-1) + ("rust-chrono" ,rust-chrono-0.4) + ("rust-chrono-tz" ,rust-chrono-tz-0.8) + ("rust-comfy-table" ,rust-comfy-table-7) + ("rust-either" ,rust-either-1) + ("rust-hashbrown" ,rust-hashbrown-0.14) + ("rust-indexmap" ,rust-indexmap-2) + ("rust-ndarray" ,rust-ndarray-0.15) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-polars-arrow" ,rust-polars-arrow-0.37) + ("rust-polars-compute" ,rust-polars-compute-0.37) + ("rust-polars-error" ,rust-polars-error-0.37) + ("rust-polars-row" ,rust-polars-row-0.37) + ("rust-polars-utils" ,rust-polars-utils-0.37) + ("rust-rand" ,rust-rand-0.8) + ("rust-rand-distr" ,rust-rand-distr-0.4) + ("rust-rayon" ,rust-rayon-1) + ("rust-regex" ,rust-regex-1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-smartstring" ,rust-smartstring-1) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-version-check" ,rust-version-check-0.9) + ("rust-xxhash-rust" ,rust-xxhash-rust-0.8)) + #:cargo-development-inputs (("rust-bincode" ,rust-bincode-1) + ("rust-serde-json" ,rust-serde-json-1)))) + (home-page "https://www.pola.rs/") + (synopsis "Core of the Polars DataFrame library") (description - "This crate provides Arrow interfaces for Polars DataFrame library.") + "This crate provides the core of the Polars @code{DataFrame} library.") (license license:expat))) (define-public rust-polars-core-0.17 (package + (inherit rust-polars-core-0.37) (name "rust-polars-core") (version "0.17.0") (source @@ -48466,10 +54341,8 @@ applications.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "1xjv2rja2pzcnn6sazgj2dqzy7gpbp57as6rcf0s0hnpcd054wb7")))) - (build-system cargo-build-system) (arguments - `(#:skip-build? - #t + `(#:skip-build? #t #:cargo-inputs (("rust-ahash" ,rust-ahash-0.7) ("rust-anyhow" ,rust-anyhow-1) @@ -48492,15 +54365,115 @@ applications.") ("rust-serde" ,rust-serde-1) ("rust-serde-json" ,rust-serde-json-1) ("rust-thiserror" ,rust-thiserror-1) - ("rust-unsafe-unwrap" ,rust-unsafe-unwrap-0.1)))) - (home-page "https://github.com/ritchie46/polars") - (synopsis "Core of the Polars DataFrame library") + ("rust-unsafe-unwrap" ,rust-unsafe-unwrap-0.1)))))) + +(define-public rust-polars-error-0.37 + (package + (name "rust-polars-error") + (version "0.37.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "polars-error" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "163pbm00v5p60rbjq4d30lkhnk2fs35259znq7c3dfni09dl7wjh")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-avro-schema" ,rust-avro-schema-0.3) + ("rust-object-store" ,rust-object-store-0.9) + ("rust-polars-arrow-format" ,rust-polars-arrow-format-0.1) + ("rust-regex" ,rust-regex-1) + ("rust-simdutf8" ,rust-simdutf8-0.1) + ("rust-thiserror" ,rust-thiserror-1)))) + (home-page "https://www.pola.rs/") + (synopsis "Error definitions for the Polars DataFrame library") + (description "This package contains the error definitions for the Polars +@code{DataFrame} library.") + (license license:expat))) + +(define-public rust-polars-ffi-0.37 + (package + (name "rust-polars-ffi") + (version "0.37.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "polars-ffi" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1afprspzpr00kr3xv6zg1pwi1l44vv97qik8gd78kj16jql328zh")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-polars-arrow" ,rust-polars-arrow-0.37) + ("rust-polars-core" ,rust-polars-core-0.37)))) + (home-page "https://www.pola.rs/") + (synopsis "FFI utils for the Polars project") + (description "FFI utils for the Polars project.") + (license license:expat))) + +(define-public rust-polars-io-0.37 + (package + (name "rust-polars-io") + (version "0.37.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "polars-io" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "13m8qk2bji7zm2fbnnp67djdpf8gah0xclw3ng13kjqly0nbl7xm")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-ahash" ,rust-ahash-0.8) + ("rust-async-trait" ,rust-async-trait-0.1) + ("rust-atoi-simd" ,rust-atoi-simd-0.15) + ("rust-bytes" ,rust-bytes-1) + ("rust-chrono" ,rust-chrono-0.4) + ("rust-chrono-tz" ,rust-chrono-tz-0.8) + ("rust-fast-float" ,rust-fast-float-0.2) + ("rust-flate2" ,rust-flate2-1) + ("rust-futures" ,rust-futures-0.3) + ("rust-home" ,rust-home-0.5) + ("rust-itoa" ,rust-itoa-1) + ("rust-memchr" ,rust-memchr-2) + ("rust-memmap2" ,rust-memmap2-0.7) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-object-store" ,rust-object-store-0.9) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-percent-encoding" ,rust-percent-encoding-2) + ("rust-polars-arrow" ,rust-polars-arrow-0.37) + ("rust-polars-core" ,rust-polars-core-0.37) + ("rust-polars-error" ,rust-polars-error-0.37) + ("rust-polars-json" ,rust-polars-json-0.37) + ("rust-polars-parquet" ,rust-polars-parquet-0.37) + ("rust-polars-time" ,rust-polars-time-0.37) + ("rust-polars-utils" ,rust-polars-utils-0.37) + ("rust-rayon" ,rust-rayon-1) + ("rust-regex" ,rust-regex-1) + ("rust-reqwest" ,rust-reqwest-0.11) + ("rust-ryu" ,rust-ryu-1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-simd-json" ,rust-simd-json-0.13) + ("rust-simdutf8" ,rust-simdutf8-0.1) + ("rust-smartstring" ,rust-smartstring-1) + ("rust-tokio" ,rust-tokio-1) + ("rust-tokio-util" ,rust-tokio-util-0.7) + ("rust-url" ,rust-url-2) + ("rust-zstd" ,rust-zstd-0.13)) + #:cargo-development-inputs (("rust-tempfile" ,rust-tempfile-3)))) + (native-inputs (list pkg-config)) + (inputs (list (list zstd "lib"))) + (home-page "https://www.pola.rs/") + (synopsis "IO related logic for the Polars DataFrame library") (description - "This crate provides the core of the Polars DataFrame library.") + "This crate provides IO related logic for the Polars @code{DataFrame} library.") (license license:expat))) (define-public rust-polars-io-0.17 (package + (inherit rust-polars-io-0.37) (name "rust-polars-io") (version "0.17.0") (source @@ -48510,7 +54483,6 @@ applications.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "0mq921184vwmadxz3996g0ilb4wiws3fajgxpvkkw1152pszb98i")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs @@ -48531,14 +54503,84 @@ applications.") ("rust-rayon" ,rust-rayon-1) ("rust-regex" ,rust-regex-1) ("rust-simdutf8" ,rust-simdutf8-0.1)))) - (home-page "https://github.com/ritchie46/polars") - (synopsis "IO related logic for the Polars DataFrame library") - (description - "This crate provides IO related logic for the Polars DataFrame library.") + (native-inputs '()) + (inputs '()))) + +(define-public rust-polars-json-0.37 + (package + (name "rust-polars-json") + (version "0.37.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "polars-json" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1v8jwfyagh8vq8l8hbgp72an83w5lxb90xrq037p0klnp901ygcp")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-ahash" ,rust-ahash-0.8) + ("rust-chrono" ,rust-chrono-0.4) + ("rust-fallible-streaming-iterator" ,rust-fallible-streaming-iterator-0.1) + ("rust-hashbrown" ,rust-hashbrown-0.14) + ("rust-indexmap" ,rust-indexmap-2) + ("rust-itoa" ,rust-itoa-1) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-polars-arrow" ,rust-polars-arrow-0.37) + ("rust-polars-error" ,rust-polars-error-0.37) + ("rust-polars-utils" ,rust-polars-utils-0.37) + ("rust-ryu" ,rust-ryu-1) + ("rust-simd-json" ,rust-simd-json-0.13) + ("rust-streaming-iterator" ,rust-streaming-iterator-0.1)))) + (home-page "https://www.pola.rs/") + (synopsis "JSON related logic for the Polars DataFrame library") + (description "JSON related logic for the Polars @code{DataFrame} library.") + (license license:expat))) + +(define-public rust-polars-lazy-0.37 + (package + (name "rust-polars-lazy") + (version "0.37.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "polars-lazy" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1y6z1l5rfhii45w2hj0sf3dbml5mlh77rl2s7a7h8vrl2gj46cyq")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; no method named `cum_sum` found for enum `polars_plan::dsl::Expr` + #:cargo-inputs (("rust-ahash" ,rust-ahash-0.8) + ("rust-bitflags" ,rust-bitflags-2) + ("rust-futures" ,rust-futures-0.3) + ("rust-glob" ,rust-glob-0.3) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-polars-arrow" ,rust-polars-arrow-0.37) + ("rust-polars-core" ,rust-polars-core-0.37) + ("rust-polars-io" ,rust-polars-io-0.37) + ("rust-polars-json" ,rust-polars-json-0.37) + ("rust-polars-ops" ,rust-polars-ops-0.37) + ("rust-polars-pipe" ,rust-polars-pipe-0.37) + ("rust-polars-plan" ,rust-polars-plan-0.37) + ("rust-polars-time" ,rust-polars-time-0.37) + ("rust-polars-utils" ,rust-polars-utils-0.37) + ("rust-pyo3" ,rust-pyo3-0.20) + ("rust-rayon" ,rust-rayon-1) + ("rust-smartstring" ,rust-smartstring-1) + ("rust-tokio" ,rust-tokio-1) + ("rust-version-check" ,rust-version-check-0.9)) + #:cargo-development-inputs (("rust-serde-json" ,rust-serde-json-1)))) + (home-page "https://www.pola.rs/") + (synopsis "Lazy query engine for the Polars DataFrame library") + (description "This crate provides a lazy query engine for the Polars +@code{DataFrame} library.") (license license:expat))) (define-public rust-polars-lazy-0.17 (package + (inherit rust-polars-lazy-0.37) (name "rust-polars-lazy") (version "0.17.0") (source @@ -48548,7 +54590,6 @@ applications.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "0qabh08q4978s33d2mn2m8c90spg21frr4lhpyxx2ngsw93scgns")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs @@ -48558,12 +54599,299 @@ applications.") ("rust-polars-core" ,rust-polars-core-0.17) ("rust-polars-io" ,rust-polars-io-0.17) ("rust-rayon" ,rust-rayon-1) - ("rust-regex" ,rust-regex-1)))) - (home-page "https://github.com/ritchie46/polars") + ("rust-regex" ,rust-regex-1)))))) + +(define-public rust-polars-ops-0.37 + (package + (name "rust-polars-ops") + (version "0.37.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "polars-ops" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "02ii63ba0l6zgilb4id1lx4s7hc1654hlg20srph3pqsbvyzb5b3")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-ahash" ,rust-ahash-0.8) + ("rust-aho-corasick" ,rust-aho-corasick-1) + ("rust-argminmax" ,rust-argminmax-0.6) + ("rust-base64" ,rust-base64-0.21) + ("rust-bytemuck" ,rust-bytemuck-1) + ("rust-chrono" ,rust-chrono-0.4) + ("rust-chrono-tz" ,rust-chrono-tz-0.8) + ("rust-either" ,rust-either-1) + ("rust-hashbrown" ,rust-hashbrown-0.14) + ("rust-hex" ,rust-hex-0.4) + ("rust-indexmap" ,rust-indexmap-2) + ("rust-jsonpath-lib" ,rust-jsonpath-lib-0.3) + ("rust-memchr" ,rust-memchr-2) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-polars-arrow" ,rust-polars-arrow-0.37) + ("rust-polars-compute" ,rust-polars-compute-0.37) + ("rust-polars-core" ,rust-polars-core-0.37) + ("rust-polars-error" ,rust-polars-error-0.37) + ("rust-polars-json" ,rust-polars-json-0.37) + ("rust-polars-utils" ,rust-polars-utils-0.37) + ("rust-rand" ,rust-rand-0.8) + ("rust-rand-distr" ,rust-rand-distr-0.4) + ("rust-rayon" ,rust-rayon-1) + ("rust-regex" ,rust-regex-1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-smartstring" ,rust-smartstring-1) + ("rust-unicode-reverse" ,rust-unicode-reverse-1) + ("rust-version-check" ,rust-version-check-0.9)) + #:cargo-development-inputs (("rust-rand" ,rust-rand-0.8)))) + (home-page "https://www.pola.rs/") + (synopsis "More operations on Polars data structures") + (description "More operations on Polars data structures.") + (license license:expat))) + +(define-public rust-polars-parquet-0.37 + (package + (name "rust-polars-parquet") + (version "0.37.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "polars-parquet" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1bvdx7mb9sd3kx969297b8rxg417gj74ln5sdwa9zk1n2v2clr5n")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-test-flags + '("--release" "--" + "--skip=parquet::compression::tests::test_codec_brotli_default" + "--skip=parquet::compression::tests::test_codec_brotli_high_compression" + "--skip=parquet::compression::tests::test_codec_brotli_low_compression" + "--skip=parquet::compression::tests::test_codec_gzip_default" + "--skip=parquet::compression::tests::test_codec_gzip_high_compression" + "--skip=parquet::compression::tests::test_codec_gzip_low_compression" + "--skip=parquet::compression::tests::test_codec_lz4_raw" + "--skip=parquet::compression::tests::test_codec_snappy" + "--skip=parquet::compression::tests::test_codec_zstd_default") + #:cargo-inputs + (("rust-ahash" ,rust-ahash-0.8) + ("rust-async-stream" ,rust-async-stream-0.3) + ("rust-base64" ,rust-base64-0.21) + ("rust-brotli" ,rust-brotli-3) + ("rust-ethnum" ,rust-ethnum-1) + ("rust-fallible-streaming-iterator" ,rust-fallible-streaming-iterator-0.1) + ("rust-flate2" ,rust-flate2-1) + ("rust-futures" ,rust-futures-0.3) + ("rust-lz4" ,rust-lz4-1) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-parquet-format-safe" ,rust-parquet-format-safe-0.2) + ("rust-polars-arrow" ,rust-polars-arrow-0.37) + ("rust-polars-error" ,rust-polars-error-0.37) + ("rust-polars-utils" ,rust-polars-utils-0.37) + ("rust-seq-macro" ,rust-seq-macro-0.3) + ("rust-serde" ,rust-serde-1) + ("rust-simdutf8" ,rust-simdutf8-0.1) + ("rust-snap" ,rust-snap-1) + ("rust-streaming-decompression" ,rust-streaming-decompression-0.1) + ("rust-xxhash-rust" ,rust-xxhash-rust-0.8) + ("rust-zstd" ,rust-zstd-0.13)))) + (home-page "https://www.pola.rs/") + (synopsis "Polars Parquet IO") + (description "This package provides polars parquet IO.") + (license (list license:asl2.0 license:expat)))) + +(define-public rust-polars-pipe-0.37 + (package + (name "rust-polars-pipe") + (version "0.37.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "polars-pipe" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1zxqg0hfws3rl66cy8rp18ka9dnz6185kc30n967miabhqdq62ir")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-crossbeam-channel" ,rust-crossbeam-channel-0.5) + ("rust-crossbeam-queue" ,rust-crossbeam-queue-0.3) + ("rust-enum-dispatch" ,rust-enum-dispatch-0.3) + ("rust-futures" ,rust-futures-0.3) + ("rust-hashbrown" ,rust-hashbrown-0.14) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-polars-arrow" ,rust-polars-arrow-0.37) + ("rust-polars-compute" ,rust-polars-compute-0.37) + ("rust-polars-core" ,rust-polars-core-0.37) + ("rust-polars-io" ,rust-polars-io-0.37) + ("rust-polars-ops" ,rust-polars-ops-0.37) + ("rust-polars-plan" ,rust-polars-plan-0.37) + ("rust-polars-row" ,rust-polars-row-0.37) + ("rust-polars-utils" ,rust-polars-utils-0.37) + ("rust-rayon" ,rust-rayon-1) + ("rust-smartstring" ,rust-smartstring-1) + ("rust-tokio" ,rust-tokio-1) + ("rust-version-check" ,rust-version-check-0.9)))) + (native-inputs (list pkg-config)) + (inputs (list (list zstd "lib"))) + (home-page "https://www.pola.rs/") (synopsis "Lazy query engine for the Polars DataFrame library") - (description - "This crate provides a lazy query engine for the Polars DataFrame -library.") + (description "Lazy query engine for the Polars @code{DataFrame} library.") + (license license:expat))) + +(define-public rust-polars-plan-0.37 + (package + (name "rust-polars-plan") + (version "0.37.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "polars-plan" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1s292gfd4d9l4x5hl0gcaz6zg7gbf9khy079mjx37ap2gd9dgdvz")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-ahash" ,rust-ahash-0.8) + ("rust-bytemuck" ,rust-bytemuck-1) + ("rust-chrono" ,rust-chrono-0.4) + ("rust-chrono-tz" ,rust-chrono-tz-0.8) + ("rust-ciborium" ,rust-ciborium-0.2) + ("rust-futures" ,rust-futures-0.3) + ("rust-libloading" ,rust-libloading-0.8) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-percent-encoding" ,rust-percent-encoding-2) + ("rust-polars-arrow" ,rust-polars-arrow-0.37) + ("rust-polars-core" ,rust-polars-core-0.37) + ("rust-polars-ffi" ,rust-polars-ffi-0.37) + ("rust-polars-io" ,rust-polars-io-0.37) + ("rust-polars-json" ,rust-polars-json-0.37) + ("rust-polars-ops" ,rust-polars-ops-0.37) + ("rust-polars-parquet" ,rust-polars-parquet-0.37) + ("rust-polars-time" ,rust-polars-time-0.37) + ("rust-polars-utils" ,rust-polars-utils-0.37) + ("rust-pyo3" ,rust-pyo3-0.20) + ("rust-rayon" ,rust-rayon-1) + ("rust-regex" ,rust-regex-1) + ("rust-serde" ,rust-serde-1) + ("rust-smartstring" ,rust-smartstring-1) + ("rust-strum-macros" ,rust-strum-macros-0.25) + ("rust-version-check" ,rust-version-check-0.9)))) + (home-page "https://www.pola.rs/") + (synopsis "Lazy query engine for the Polars DataFrame library") + (description "Lazy query engine for the Polars @code{DataFrame} library.") + (license license:expat))) + +(define-public rust-polars-row-0.37 + (package + (name "rust-polars-row") + (version "0.37.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "polars-row" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "130nsv61fa8dmq1mg2v12q97mqxm22mvqvp7my9dpl6kmablv67l")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-polars-arrow" ,rust-polars-arrow-0.37) + ("rust-polars-error" ,rust-polars-error-0.37) + ("rust-polars-utils" ,rust-polars-utils-0.37)))) + (home-page "https://www.pola.rs/") + (synopsis "Row encodings for the Polars DataFrame library") + (description "Row encodings for the Polars @code{DataFrame} library.") + (license license:expat))) + +(define-public rust-polars-sql-0.37 + (package + (name "rust-polars-sql") + (version "0.37.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "polars-sql" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0jllznqx496lzndl8ph32204w5zbgvbl1wrfxg0nw54kiy5jmxkp")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-hex" ,rust-hex-0.4) + ("rust-polars-arrow" ,rust-polars-arrow-0.37) + ("rust-polars-core" ,rust-polars-core-0.37) + ("rust-polars-error" ,rust-polars-error-0.37) + ("rust-polars-lazy" ,rust-polars-lazy-0.37) + ("rust-polars-plan" ,rust-polars-plan-0.37) + ("rust-rand" ,rust-rand-0.8) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-sqlparser" ,rust-sqlparser-0.39)) + #:cargo-development-inputs (("rust-polars-core" ,rust-polars-core-0.37)))) + (home-page "https://www.pola.rs/") + (synopsis "SQL transpiler for Polars") + (description "This package contains an SQL transpiler for Polars. It can +convert SQL to Polars logical plans.") + (license license:expat))) + +(define-public rust-polars-time-0.37 + (package + (name "rust-polars-time") + (version "0.37.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "polars-time" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0ly7dpch3h8s9sn8q9y6mxfnrb566p5hx1nzhcxpzjfha6538xbd")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-atoi" ,rust-atoi-2) + ("rust-chrono" ,rust-chrono-0.4) + ("rust-chrono-tz" ,rust-chrono-tz-0.8) + ("rust-now" ,rust-now-0.1) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-polars-arrow" ,rust-polars-arrow-0.37) + ("rust-polars-core" ,rust-polars-core-0.37) + ("rust-polars-error" ,rust-polars-error-0.37) + ("rust-polars-ops" ,rust-polars-ops-0.37) + ("rust-polars-utils" ,rust-polars-utils-0.37) + ("rust-regex" ,rust-regex-1) + ("rust-serde" ,rust-serde-1) + ("rust-smartstring" ,rust-smartstring-1)))) + (home-page "https://www.pola.rs/") + (synopsis "Time related code for the Polars DataFrame library") + (description "This package contains the time related code for the Polars +@code{DataFrame} library.") + (license license:expat))) + +(define-public rust-polars-utils-0.37 + (package + (name "rust-polars-utils") + (version "0.37.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "polars-utils" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0sdmyyd2nzgbkjbxl2jzpqdf09l89r7gxdxf6pc5b6qypdawky9q")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-ahash" ,rust-ahash-0.8) + ("rust-bytemuck" ,rust-bytemuck-1) + ("rust-hashbrown" ,rust-hashbrown-0.14) + ("rust-indexmap" ,rust-indexmap-2) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-polars-error" ,rust-polars-error-0.37) + ("rust-rayon" ,rust-rayon-1) + ("rust-smartstring" ,rust-smartstring-1) + ("rust-sysinfo" ,rust-sysinfo-0.30) + ("rust-version-check" ,rust-version-check-0.9)))) + (home-page "https://www.pola.rs/") + (synopsis "Private utils for the Polars DataFrame library") + (description "This package contains the private utils for the Polars +@code{DataFrame} library.") (license license:expat))) (define-public rust-polling-3 @@ -48672,23 +55000,43 @@ library.") (define-public rust-pom-3 (package (name "rust-pom") - (version "3.2.0") + (version "3.4.0") (source (origin (method url-fetch) (uri (crate-uri "pom" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1v14c2p1irblagnljkw4n0f1w5r8mbybzycz0j1f5y79h0kikqh7")))) + "0jvlsxzzwwmfng3sk0drig8x36klbabfh10b5m9sshz9hs7jv5vc")))) (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-bstr" ,rust-bstr-1)))) (home-page "https://github.com/J-F-Liu/pom") (synopsis "PEG parser combinators using operator overloading without macros") (description "This package provides a PEG parser combinators using operator overloading without macros in Rust.") (license license:expat))) +(define-public rust-pori-0.0.0 + (package + (name "rust-pori") + (version "0.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "pori" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "01p9g4fn3kasnmwj8i4plzk6nnnk7ak2qsfcv9b9y4zcilrkv9m4")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-nom" ,rust-nom-7)))) + (home-page "https://github.com/olson-sean-k/pori") + (synopsis "Parser state and error extensions for nom") + (description "Parser state and error extensions for nom.") + (license license:expat))) + (define-public rust-portable-atomic-1 (package (name "rust-portable-atomic") @@ -48785,6 +55133,55 @@ audio I/O library.") I/O library.") (license license:expat))) +(define-public rust-postcard-1 + (package + (name "rust-postcard") + (version "1.0.8") + (source + (origin + (method url-fetch) + (uri (crate-uri "postcard" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1y106iwjv6vm7s4zkszgxlhacca1xbw6qcwf8il7xc0ddkp52p55")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-cobs" ,rust-cobs-0.2) + ("rust-const-format" ,rust-const-format-0.2) + ("rust-crc" ,rust-crc-3) + ("rust-defmt" ,rust-defmt-0.3) + ("rust-embedded-io" ,rust-embedded-io-0.4) + ("rust-heapless" ,rust-heapless-0.7) + ("rust-paste" ,rust-paste-1) + ("rust-postcard-derive" ,rust-postcard-derive-0.1) + ("rust-serde" ,rust-serde-1)))) + (home-page "https://github.com/jamesmunns/postcard") + (synopsis "A no_std + serde compatible message library for Rust") + (description + "This package provides a no_std + serde compatible message library for Rust.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-postcard-derive-0.1 + (package + (name "rust-postcard-derive") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "postcard-derive" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0ycsfl3nb37syvlj92nl98lphykq78b7af7nv8h49pc7hwhh2jzw")))) + (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/jamesmunns/postcard") + (synopsis "Derive crate for postcard") + (description "This package provides the implementation details for postcard.") + (license (list license:expat license:asl2.0)))) + (define-public rust-postgres-0.19 (package (name "rust-postgres") @@ -48953,6 +55350,85 @@ with alignment, avoid heap allocation, and avoid repetitive calculations.") and should not be relied upon directly.") (license (list license:expat license:asl2.0)))) +(define-public rust-pprof-0.13 + (package + (name "rust-pprof") + (version "0.13.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "pprof" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1jqi6yakwwhln5b1vr3aprgl2kdlvsmidqh24is7wk6k3g2rfp7g")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; no method named `flamegraph` found for struct `pprof::Report` + #:cargo-inputs + (("rust-backtrace" ,rust-backtrace-0.3) + ("rust-cfg-if" ,rust-cfg-if-1) + ("rust-criterion" ,rust-criterion-0.5) + ("rust-findshlibs" ,rust-findshlibs-0.10) + ("rust-inferno" ,rust-inferno-0.11) + ("rust-libc" ,rust-libc-0.2) + ("rust-log" ,rust-log-0.4) + ("rust-nix" ,rust-nix-0.26) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-parking-lot" ,rust-parking-lot-0.12) + ("rust-prost" ,rust-prost-0.12) + ("rust-prost-build" ,rust-prost-build-0.12) + ("rust-prost-derive" ,rust-prost-derive-0.12) + ("rust-protobuf" ,rust-protobuf-2) + ("rust-protobuf-codegen-pure" ,rust-protobuf-codegen-pure-2) + ("rust-sha2" ,rust-sha2-0.10) + ("rust-smallvec" ,rust-smallvec-1) + ("rust-symbolic-demangle" ,rust-symbolic-demangle-12) + ("rust-tempfile" ,rust-tempfile-3) + ("rust-thiserror" ,rust-thiserror-1)) + #:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.5) + ("rust-rand" ,rust-rand-0.8)))) + (home-page "https://github.com/tikv/pprof-rs") + (synopsis "Internal perf tools for rust programs") + (description "This package provides internal perf tools for Rust +programs.") + (license license:asl2.0))) + +(define-public rust-pprof-0.10 + (package + (inherit rust-pprof-0.13) + (name "rust-pprof") + (version "0.10.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "pprof" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0vvqawd720d39a87zhdjdh7ipmq6im5766658sn44ma7v7z2niyn")))) + (arguments + `(#:tests? #f ; no method named `flamegraph` found for struct `pprof::Report` + #:cargo-inputs (("rust-backtrace" ,rust-backtrace-0.3) + ("rust-cfg-if" ,rust-cfg-if-1) + ("rust-criterion" ,rust-criterion-0.3) + ("rust-findshlibs" ,rust-findshlibs-0.10) + ("rust-inferno" ,rust-inferno-0.11) + ("rust-libc" ,rust-libc-0.2) + ("rust-log" ,rust-log-0.4) + ("rust-nix" ,rust-nix-0.24) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-parking-lot" ,rust-parking-lot-0.12) + ("rust-prost" ,rust-prost-0.10) + ("rust-prost-build" ,rust-prost-build-0.10) + ("rust-prost-derive" ,rust-prost-derive-0.10) + ("rust-protobuf" ,rust-protobuf-2) + ("rust-protobuf-codegen-pure" ,rust-protobuf-codegen-pure-2) + ("rust-smallvec" ,rust-smallvec-1) + ("rust-symbolic-demangle" ,rust-symbolic-demangle-9) + ("rust-tempfile" ,rust-tempfile-3) + ("rust-thiserror" ,rust-thiserror-1)) + #:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.3) + ("rust-rand" ,rust-rand-0.8)))))) + (define-public rust-pq-sys-0.4 (package (name "rust-pq-sys") @@ -49005,14 +55481,14 @@ dependency to expose a precomputed hash.") (define-public rust-predicates-3 (package (name "rust-predicates") - (version "3.0.4") + (version "3.1.0") (source (origin (method url-fetch) (uri (crate-uri "predicates" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "182q0wiabllvbg0nzfkf8a6qkbk0ckrkmfbk7k5ijgrfbibjiz3d")))) + (base32 "1s676s13sva6ikv2qmfmm7n3y3jnzvwbbhy1xzgnr4h58vyppf38")))) (build-system cargo-build-system) (arguments `(#:cargo-test-flags @@ -49022,7 +55498,6 @@ dependency to expose a precomputed hash.") (("rust-anstyle" ,rust-anstyle-1) ("rust-difflib" ,rust-difflib-0.4) ("rust-float-cmp" ,rust-float-cmp-0.9) - ("rust-itertools" ,rust-itertools-0.11) ("rust-normalize-line-endings" ,rust-normalize-line-endings-0.3) ("rust-predicates-core" ,rust-predicates-core-1) ("rust-regex" ,rust-regex-1)) @@ -49309,6 +55784,26 @@ replacements, adding colorful diffs.") ("rust-ansi-term" ,rust-ansi-term-0.11) ("rust-difference" ,rust-difference-2)))))) +(define-public rust-pretty-assertions-0.5 + (package + (inherit rust-pretty-assertions-0.7) + (name "rust-pretty-assertions") + (version "0.5.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "pretty_assertions" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1ins6swkpxmrh8q5h96h8nv0497d3dclsiyx2lyvqi6py0q980is")))) + (arguments + `(#:tests? #f ;XXX: Tests fail + #:cargo-inputs + (("rust-ansi-term" ,rust-ansi-term-0.11) + ("rust-difference" ,rust-difference-2)))))) + (define-public rust-pretty-assertions-0.4 (package (inherit rust-pretty-assertions-0.6) @@ -49554,6 +56049,29 @@ losslessly as possible.") #:cargo-development-inputs (("rust-os-str-bytes" ,rust-os-str-bytes-2)))))) +(define-public rust-print-positions-0.6 + (package + (name "rust-print-positions") + (version "0.6.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "print-positions" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "026jzdf63b37bb9ix3mpczln2pqylsiwkkxhikj05x9y1r3r7x8x")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-unicode-segmentation" ,rust-unicode-segmentation-1)) + #:cargo-development-inputs (("rust-anyhow" ,rust-anyhow-1)))) + (home-page "https://github.com/bobhy/print-positions") + (synopsis "Library providing string segmentation on grapheme clusters") + (description + "This package provides a library providing string segmentation on grapheme +clusters and ANSI escape sequences for accurate length arithmetic based on +visible print positions.") + (license (list license:expat license:asl2.0)))) + (define-public rust-priority-queue-1 (package (name "rust-priority-queue") @@ -49833,22 +56351,25 @@ in your code.") (define-public rust-proc-macro2-1 (package (name "rust-proc-macro2") - (version "1.0.76") + (version "1.0.79") (source (origin (method url-fetch) (uri (crate-uri "proc-macro2" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "136cp0fgl6rg5ljm3b1xpc0bn0lyvagzzmxvbxgk5hxml36mdz4m")))) + (base32 "0bn004ybzdqid81cqppr5c9jrvqsxv50x60sxc41cwpmk0igydg8")))) (build-system cargo-build-system) (arguments `(#:cargo-test-flags '("--lib") #:cargo-inputs (("rust-unicode-ident" ,rust-unicode-ident-1)) #:cargo-development-inputs - (("rust-quote" ,rust-quote-1) - ("rust-rustversion" ,rust-rustversion-1)))) + (("rust-flate2" ,rust-flate2-1) + ("rust-quote" ,rust-quote-1) + ("rust-rayon" ,rust-rayon-1) + ("rust-rustversion" ,rust-rustversion-1) + ("rust-tar" ,rust-tar-0.4)))) (home-page "https://github.com/dtolnay/proc-macro2") (synopsis "Stable implementation of the upcoming new `proc_macro` API") (description "This package provides a stable implementation of the upcoming new @@ -49916,7 +56437,7 @@ macro use case.") (base32 "1j48ipc80pykvhx6yhndfa774s58ax1h6sm6mlhf09ls76f6l1mg")))) (build-system cargo-build-system) (arguments - `(#:tests? #f ; cannot determine resolution for the macro `diagnostic_item` + `(#:cargo-test-flags '("--release" "--" "--skip=main") #:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) ("rust-quote" ,rust-quote-1) ("rust-syn" ,rust-syn-2) @@ -49925,9 +56446,30 @@ macro use case.") #:cargo-development-inputs (("rust-trybuild" ,rust-trybuild-1)))) (home-page "https://github.com/SergioBenitez/proc-macro2-diagnostics") (synopsis "Diagnostics for proc-macro2") - (description "Diagnostics for proc-macro2.") + (description "Diagnostics for stable and nightly proc-macros!") (license (list license:expat license:asl2.0)))) +(define-public rust-proc-macro2-diagnostics-0.9 + (package + (inherit rust-proc-macro2-diagnostics-0.10) + (name "rust-proc-macro2-diagnostics") + (version "0.9.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "proc-macro2-diagnostics" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1nmazlb1dkznjds7qwms7yxhi33ajc3isji2lsgx8r3lsqk9gwjb")))) + (arguments + `(#:cargo-test-flags '("--release" "--" "--skip=main") + #:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1) + ("rust-version-check" ,rust-version-check-0.9) + ("rust-yansi" ,rust-yansi-0.5)) + #:cargo-development-inputs (("rust-trybuild" ,rust-trybuild-1)))))) + (define-public rust-proc-mounts-0.3 (package (name "rust-proc-mounts") @@ -49948,8 +56490,200 @@ macro use case.") "This package provides fetching active mounts and swaps on a Linux system.") (license license:expat))) +(define-public rust-proc-quote-0.4 + (package + (name "rust-proc-quote") + (version "0.4.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "proc-quote" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0051nax31x1yzr1imbp200l2gpz6pqcmlcna099r33773lbap12y")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; The test suite hasn't aged well + #:cargo-inputs (("rust-proc-macro-hack" ,rust-proc-macro-hack-0.5) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-proc-quote-impl" ,rust-proc-quote-impl-0.3) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)))) + (home-page "https://github.com/Goncalerta/proc-quote") + (synopsis "Procedural macro implementation of quote!") + (description + "This package provides a procedural macro implementation of quote!.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-proc-quote-impl-0.3 + (package + (name "rust-proc-quote-impl") + (version "0.3.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "proc-quote-impl" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "184ax14pyazv5g6yma60ls7x4hd5q6wah1kf677xng06idifrcvz")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-proc-macro-hack" ,rust-proc-macro-hack-0.5) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1)))) + (home-page "https://github.com/Goncalerta/proc-quote") + (synopsis "Procedural macro implementation of quote!") + (description + "This package provides a procedural macro implementation of quote!.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-procfs-0.16 + (package + (name "rust-procfs") + (version "0.16.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "procfs" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1d4k8ai16b5cv05dpz7b87qn5dap3jdyfnrvycb5zhmhas9hs7kk")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-test-flags + '("--release" "--" + "--skip=net::tests::test_snmp" + "--skip=process::task::tests::test_task_runsinglethread" + "--skip=process::tests::test_proc_status_for_kthreadd" + "--skip=tests::test_meminfo" + "--skip=process::tests::test_proc_fd_count_runsinglethread") + #:cargo-inputs + (("rust-backtrace" ,rust-backtrace-0.3) + ("rust-bitflags" ,rust-bitflags-2) + ("rust-chrono" ,rust-chrono-0.4) + ("rust-flate2" ,rust-flate2-1) + ("rust-hex" ,rust-hex-0.4) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-procfs-core" ,rust-procfs-core-0.16) + ("rust-rustix" ,rust-rustix-0.38) + ("rust-serde" ,rust-serde-1)) + #:cargo-development-inputs + (("rust-criterion" ,rust-criterion-0.5) + ("rust-failure" ,rust-failure-0.1) + ("rust-libc" ,rust-libc-0.2) + ("rust-procinfo" ,rust-procinfo-0.4)))) + (home-page "https://github.com/eminence/procfs") + (synopsis "Interface to the Linux procfs pseudo-filesystem") + (description + "This package provides an interface to the Linux procfs pseudo-filesystem.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-procfs-core-0.16 + (package + (name "rust-procfs-core") + (version "0.16.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "procfs-core" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0acs0p19yfcs0h787ls24vi5ql4g6c62cm57qh2cxx397a958d9d")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-backtrace" ,rust-backtrace-0.3) + ("rust-bitflags" ,rust-bitflags-2) + ("rust-chrono" ,rust-chrono-0.4) + ("rust-hex" ,rust-hex-0.4) + ("rust-serde" ,rust-serde-1)))) + (home-page "https://github.com/eminence/procfs") + (synopsis "Data structures and parsing for the procfs pseudo-filesystem") + (description + "This package provides data structures and parsing for the Linux procfs +pseudo-filesystem.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-procinfo-0.4 + (package + (name "rust-procinfo") + (version "0.4.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "procinfo" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "175l4cprsb56jrkycpz0743clgc8fyhxv4i8hhgqjd967mzl5cba")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-test-flags + '("--release" "--" ; thread panic on bad unwrap. + "--skip=pid::status::tests::test_status") + #:cargo-inputs + (("rust-byteorder" ,rust-byteorder-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-nom" ,rust-nom-2) + ("rust-rustc-version" ,rust-rustc-version-0.2)))) + (home-page "https://github.com/danburkert/procinfo-rs") + (synopsis "Library for accessing Linux processes and system information") + (description + "This package provides a library for accessing Linux processes and system +information.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-prodash-28 + (package + (name "rust-prodash") + (version "28.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "prodash" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0y9d16s79168rc5k2djjb16vjcx27yargbfb6xz6m2mq4r6jcjkl")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-async-io" ,rust-async-io-2) + ("rust-bytesize" ,rust-bytesize-1) + ("rust-crosstermion" ,rust-crosstermion-0.13) + ("rust-ctrlc" ,rust-ctrlc-3) + ("rust-dashmap" ,rust-dashmap-5) + ("rust-futures-core" ,rust-futures-core-0.3) + ("rust-futures-lite" ,rust-futures-lite-2) + ("rust-human-format" ,rust-human-format-1) + ("rust-humantime" ,rust-humantime-2) + ("rust-is-terminal" ,rust-is-terminal-0.4) + ("rust-log" ,rust-log-0.4) + ("rust-parking-lot" ,rust-parking-lot-0.12) + ("rust-ratatui" ,rust-ratatui-0.25) + ("rust-signal-hook" ,rust-signal-hook-0.3) + ("rust-time" ,rust-time-0.3) + ("rust-tui-react" ,rust-tui-react-0.22) + ("rust-unicode-segmentation" ,rust-unicode-segmentation-1) + ("rust-unicode-width" ,rust-unicode-width-0.1)) + #:cargo-development-inputs (("rust-argh" ,rust-argh-0.1) + ("rust-async-executor" ,rust-async-executor-1) + ("rust-async-io" ,rust-async-io-2) + ("rust-blocking" ,rust-blocking-1) + ("rust-criterion" ,rust-criterion-0.5) + ("rust-env-logger" ,rust-env-logger-0.10) + ("rust-futures" ,rust-futures-0.3) + ("rust-futures-util" ,rust-futures-util-0.3) + ("rust-is-terminal" ,rust-is-terminal-0.4) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-rand" ,rust-rand-0.8)))) + (home-page "https://github.com/Byron/prodash") + (synopsis + "Dashboard for visualizing progress of asynchronous and possibly blocking tasks") + (description + "This package provides a dashboard for visualizing the progress of asynchronous +and possibly blocking tasks.") + (license license:expat))) + (define-public rust-prodash-26 (package + (inherit rust-prodash-28) (name "rust-prodash") (version "26.2.2") (source @@ -49959,7 +56693,6 @@ macro use case.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "1kxvsxyh79qz524vl0r50svga84fcax4ngpcvkf576yiwbw5njvr")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-async-io" ,rust-async-io-1) ("rust-bytesize" ,rust-bytesize-1) @@ -49990,14 +56723,7 @@ macro use case.") ("rust-futures-util" ,rust-futures-util-0.3) ("rust-is-terminal" ,rust-is-terminal-0.4) ("rust-once-cell" ,rust-once-cell-1) - ("rust-rand" ,rust-rand-0.8)))) - (home-page "https://github.com/Byron/prodash") - (synopsis - "Dashboard for visualizing progress of asynchronous and possibly blocking tasks") - (description - "This package provides a dashboard for visualizing the progress of asynchronous -and possibly blocking tasks.") - (license license:expat))) + ("rust-rand" ,rust-rand-0.8)))))) (define-public rust-prodash-25 (package @@ -50145,6 +56871,31 @@ status.") progress-bars for Rust.") (license license:asl2.0))) +(define-public rust-project-origins-1 + (package + (name "rust-project-origins") + (version "1.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "project-origins" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1lizp7dp6ddrlgh3xigl8pyai5qn8ab7lnhgwsb19ihgpyix8xm0")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; failed to resolve: could not find `main` in `tokio` + #:cargo-inputs (("rust-futures" ,rust-futures-0.3) + ("rust-tokio" ,rust-tokio-1) + ("rust-tokio-stream" ,rust-tokio-stream-0.1)) + #:cargo-development-inputs + (("rust-miette" ,rust-miette-5) + ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3)))) + (home-page "https://github.com/watchexec/watchexec") + (synopsis "Resolve project origins and kinds from a path") + (description "Resolve project origins and kinds from a path.") + (license license:asl2.0))) + (define-public rust-propfuzz-0.0.1 (package (name "rust-propfuzz") @@ -50325,8 +57076,45 @@ including most strategies and the testing framework itself.") #:cargo-development-inputs (("rust-regex" ,rust-regex-0.2)))))) +(define-public rust-proptest-derive-0.4 + (package + (name "rust-proptest-derive") + (version "0.4.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "proptest-derive" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0vhb7zmnbmn0qvv6x7ibs88pg0mn6d3131c9qzlq982w80vn7wcw")) + (modules '((guix build utils))) + ;; Need never_type nightly feature. + (snippet '(begin (delete-file "tests/uninhabited-pass.rs") + (delete-file "tests/enum.rs") + (delete-file "tests/skip.rs"))))) + (build-system cargo-build-system) + (arguments + `(#:cargo-test-flags + '("--release" "--" + ;; can't find crate for `proptest_derive` + "--skip=compile_test") + #:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)) + #:cargo-development-inputs + (("rust-compiletest-rs" ,rust-compiletest-rs-0.9) + ("rust-criterion" ,rust-criterion-0.5) + ("rust-proptest" ,rust-proptest-1)))) + (home-page + "https://proptest-rs.github.io/proptest/proptest-derive/index.html") + (synopsis "Custom-derive for the Arbitrary trait of proptest") + (description "This package provides a custom-derive for the Arbitrary +trait of proptest.") + (license (list license:expat license:asl2.0)))) + (define-public rust-proptest-derive-0.3 (package + (inherit rust-proptest-derive-0.4) (name "rust-proptest-derive") (version "0.3.0") (source @@ -50336,7 +57124,6 @@ including most strategies and the testing framework itself.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "1p4x6k1zxq9lrpk46npdnzj6894mjx5bpwkwrdk63ird72an5d4h")))) - (build-system cargo-build-system) (arguments `(#:tests? #f ; Needs nightly features. #:cargo-inputs @@ -50346,13 +57133,7 @@ including most strategies and the testing framework itself.") #:cargo-development-inputs (("rust-compiletest-rs" ,rust-compiletest-rs-0.3) ("rust-criterion" ,rust-criterion-0.2) - ("rust-proptest" ,rust-proptest-1)))) - (home-page - "https://altsysrq.github.io/proptest-book/proptest-derive/index.html") - (synopsis "Custom-derive for the Arbitrary trait of proptest") - (description "This package provides a Custom-derive for the Arbitrary -trait of proptest.") - (license (list license:expat license:asl2.0)))) + ("rust-proptest" ,rust-proptest-1)))))) (define-public rust-proptest-derive-0.1 (package @@ -50426,6 +57207,27 @@ language.") ("rust-proptest" ,rust-proptest-1) ("rust-rand" ,rust-rand-0.8)))))) +(define-public rust-prost-0.10 + (package + (inherit rust-prost-0.12) + (name "rust-prost") + (version "0.10.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "prost" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0gh81qwzpi04cfxiypddpad9pvcdssy31fv9zjpdm84anqfz9bbi")))) + (arguments + `(#:cargo-inputs (("rust-bytes" ,rust-bytes-1) + ("rust-prost-derive" ,rust-prost-derive-0.10)) + #:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.3) + ("rust-env-logger" ,rust-env-logger-0.8) + ("rust-log" ,rust-log-0.4) + ("rust-proptest" ,rust-proptest-1) + ("rust-rand" ,rust-rand-0.8)))))) + (define-public rust-prost-0.9 (package (inherit rust-prost-0.11) @@ -50444,6 +57246,75 @@ language.") (("rust-bytes" ,rust-bytes-1) ("rust-prost-derive" ,rust-prost-derive-0.9)))))) +(define-public rust-prost-build-0.12 + (package + (name "rust-prost-build") + (version "0.12.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "prost-build" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1lp2l1l65l163yggk9nw5mjb2fqwzz12693af5phn1v0abih4pn5")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-test-flags '("--release" "--" + "--skip=tests::test_generate_message_attributes") + #:cargo-inputs (("rust-bytes" ,rust-bytes-1) + ("rust-heck" ,rust-heck-0.4) + ("rust-itertools" ,rust-itertools-0.10) + ("rust-log" ,rust-log-0.4) + ("rust-multimap" ,rust-multimap-0.8) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-petgraph" ,rust-petgraph-0.6) + ("rust-prettyplease" ,rust-prettyplease-0.2) + ("rust-prost" ,rust-prost-0.12) + ("rust-prost-types" ,rust-prost-types-0.12) + ("rust-pulldown-cmark" ,rust-pulldown-cmark-0.9) + ("rust-pulldown-cmark-to-cmark" ,rust-pulldown-cmark-to-cmark-10) + ("rust-regex" ,rust-regex-1) + ("rust-syn" ,rust-syn-2) + ("rust-tempfile" ,rust-tempfile-3) + ("rust-which" ,rust-which-4)) + #:cargo-development-inputs (("rust-env-logger" ,rust-env-logger-0.10)))) + (native-inputs (list protobuf)) + (home-page "https://github.com/tokio-rs/prost") + (synopsis "Protocol Buffers implementation for the Rust Language") + (description + "@code{prost-build} makes it easy to generate Rust code from @code{.proto} +files as part of a Cargo build.") + (license license:asl2.0))) + +(define-public rust-prost-build-0.10 + (package + (inherit rust-prost-build-0.12) + (name "rust-prost-build") + (version "0.10.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "prost-build" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1aqc9cjrfwd5kh65xig0vp4cs8dhaqya7pn0kxd83mb2hwwa9rca")))) + (arguments + `(#:cargo-inputs (("rust-bytes" ,rust-bytes-1) + ("rust-cfg-if" ,rust-cfg-if-1) + ("rust-cmake" ,rust-cmake-0.1) + ("rust-heck" ,rust-heck-0.4) + ("rust-itertools" ,rust-itertools-0.10) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-log" ,rust-log-0.4) + ("rust-multimap" ,rust-multimap-0.8) + ("rust-petgraph" ,rust-petgraph-0.6) + ("rust-prost" ,rust-prost-0.10) + ("rust-prost-types" ,rust-prost-types-0.10) + ("rust-regex" ,rust-regex-1) + ("rust-tempfile" ,rust-tempfile-3) + ("rust-which" ,rust-which-4)) + #:cargo-development-inputs (("rust-env-logger" ,rust-env-logger-0.8)))))) + (define-public rust-prost-derive-0.12 (package (name "rust-prost-derive") @@ -50490,6 +57361,25 @@ the most part, users of @code{prost} shouldn't need to interact with ("rust-quote" ,rust-quote-1) ("rust-syn" ,rust-syn-1)))))) +(define-public rust-prost-derive-0.10 + (package + (inherit rust-prost-derive-0.12) + (name "rust-prost-derive") + (version "0.10.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "prost-derive" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1k77nir4xa06gbsdjzlygyv73razj9d11dnvxd18byspv92hyrvv")))) + (arguments + `(#:cargo-inputs (("rust-anyhow" ,rust-anyhow-1) + ("rust-itertools" ,rust-itertools-0.10) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)))))) + (define-public rust-prost-derive-0.9 (package (inherit rust-prost-derive-0.11) @@ -50511,67 +57401,44 @@ the most part, users of @code{prost} shouldn't need to interact with ("rust-quote" ,rust-quote-1) ("rust-syn" ,rust-syn-1)))))) -(define-public rust-prost-build-0.12 +(define-public rust-prost-types-0.12 (package - (name "rust-prost-build") + (name "rust-prost-types") (version "0.12.3") (source (origin (method url-fetch) - (uri (crate-uri "prost-build" version)) + (uri (crate-uri "prost-types" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1lp2l1l65l163yggk9nw5mjb2fqwzz12693af5phn1v0abih4pn5")))) + (base32 "03j73llzljdxv9cdxp4m3vb9j3gh4y24rkbx48k3rx6wkvsrhf0r")))) (build-system cargo-build-system) (arguments - `(#:cargo-test-flags '("--release" "--" - "--skip=tests::test_generate_message_attributes") - #:cargo-inputs (("rust-bytes" ,rust-bytes-1) - ("rust-heck" ,rust-heck-0.4) - ("rust-itertools" ,rust-itertools-0.10) - ("rust-log" ,rust-log-0.4) - ("rust-multimap" ,rust-multimap-0.8) - ("rust-once-cell" ,rust-once-cell-1) - ("rust-petgraph" ,rust-petgraph-0.6) - ("rust-prettyplease" ,rust-prettyplease-0.2) - ("rust-prost" ,rust-prost-0.12) - ("rust-prost-types" ,rust-prost-types-0.12) - ("rust-pulldown-cmark" ,rust-pulldown-cmark-0.9) - ("rust-pulldown-cmark-to-cmark" ,rust-pulldown-cmark-to-cmark-10) - ("rust-regex" ,rust-regex-1) - ("rust-syn" ,rust-syn-2) - ("rust-tempfile" ,rust-tempfile-3) - ("rust-which" ,rust-which-4)) - #:cargo-development-inputs (("rust-env-logger" ,rust-env-logger-0.10)))) - (native-inputs (list protobuf)) + `(#:cargo-inputs (("rust-prost" ,rust-prost-0.12)) + #:cargo-development-inputs (("rust-proptest" ,rust-proptest-1)))) (home-page "https://github.com/tokio-rs/prost") - (synopsis "Protocol Buffers implementation for the Rust Language") + (synopsis "Prost definitions of Protocol Buffers well known types") (description - "@code{prost-build} makes it easy to generate Rust code from @code{.proto} -files as part of a Cargo build.") + "Prost definitions of Protocol Buffers well known types. See the +Protobuf reference for more information about well known types.") (license license:asl2.0))) -(define-public rust-prost-types-0.12 +(define-public rust-prost-types-0.10 (package + (inherit rust-prost-types-0.12) (name "rust-prost-types") - (version "0.12.3") + (version "0.10.1") (source (origin (method url-fetch) (uri (crate-uri "prost-types" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "03j73llzljdxv9cdxp4m3vb9j3gh4y24rkbx48k3rx6wkvsrhf0r")))) - (build-system cargo-build-system) + (base32 "0s0y8sc045xjynikw7n9ywm0z39fdkna3j39ivf1241n551022id")))) (arguments - `(#:cargo-inputs (("rust-prost" ,rust-prost-0.12)) - #:cargo-development-inputs (("rust-proptest" ,rust-proptest-1)))) - (home-page "https://github.com/tokio-rs/prost") - (synopsis "Prost definitions of Protocol Buffers well known types") - (description - "Prost definitions of Protocol Buffers well known types. See the -Protobuf reference for more information about well known types.") - (license license:asl2.0))) + `(#:cargo-inputs (("rust-bytes" ,rust-bytes-1) + ("rust-prost" ,rust-prost-0.10)) + #:cargo-development-inputs (("rust-proptest" ,rust-proptest-1)))))) ;; It's recommended that rust-protobuf, rust-protobuf-codegen ;; and rust-probuf-codegen-pure be the same version @@ -50873,6 +57740,68 @@ compliant email address validation.") ("rust-regex" ,rust-regex-1) ("rust-url" ,rust-url-2)))))) +(define-public rust-public-api-0.33 + (package + (name "rust-public-api") + (version "0.33.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "public-api" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1i1qg7z96l0y5cjna6kppsvkvlpqkvmsns75zjb61jbsh3pfwndp")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f + #:cargo-inputs (("rust-hashbag" ,rust-hashbag-0.1) + ("rust-rustdoc-types" ,rust-rustdoc-types-0.23) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-thiserror" ,rust-thiserror-1)) + #:cargo-development-inputs + (("rust-anyhow" ,rust-anyhow-1) + ("rust-assert-cmd" ,rust-assert-cmd-2) + ("rust-expect-test" ,rust-expect-test-1) + ("rust-itertools" ,rust-itertools-0.12) + ("rust-predicates" ,rust-predicates-3) + ("rust-pretty-assertions" ,rust-pretty-assertions-1) + ("rust-rustdoc-json" ,rust-rustdoc-json-0.8) + ("rust-tempfile" ,rust-tempfile-3)))) + (home-page + "https://github.com/Enselic/cargo-public-api/tree/main/public-api") + (synopsis "List diff public API of Rust library crates") + (description "List and diff the public API of Rust library crates. Relies +on rustdoc JSON output from the nightly toolchain.") + (license license:expat))) + +(define-public rust-public-api-0.32 + (package + (inherit rust-public-api-0.33) + (name "rust-public-api") + (version "0.32.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "public-api" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "02wpk9j21fxjf5is5jpkq00cl7vvpnkib1l72v7wylkw8ah5rgfq")))) + (arguments + `(#:tests? #f + #:cargo-inputs (("rust-hashbag" ,rust-hashbag-0.1) + ("rust-rustdoc-types" ,rust-rustdoc-types-0.23) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-thiserror" ,rust-thiserror-1)) + #:cargo-development-inputs (("rust-anyhow" ,rust-anyhow-1) + ("rust-assert-cmd" ,rust-assert-cmd-2) + ("rust-expect-test" ,rust-expect-test-1) + ("rust-itertools" ,rust-itertools-0.11) + ("rust-predicates" ,rust-predicates-3) + ("rust-rustdoc-json" ,rust-rustdoc-json-0.8) + ("rust-tempfile" ,rust-tempfile-3)))))) + (define-public rust-puffin-0.18 (package (name "rust-puffin") @@ -50998,6 +57927,28 @@ in codeblocks, while assuring quality with a powerful test suite.") ("rust-regex" ,rust-regex-1) ("rust-tendril" ,rust-tendril-0.4)))))) +(define-public rust-pulldown-cmark-to-cmark-7 + (package + (inherit rust-pulldown-cmark-to-cmark-10) + (name "rust-pulldown-cmark-to-cmark") + (version "7.1.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "pulldown-cmark-to-cmark" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "03f6bnqjzchmzs4qaf63pirgj95b0x3l2rlp1wj1z27mp734phcb")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-pulldown-cmark" ,rust-pulldown-cmark-0.8)) + #:cargo-development-inputs + (("rust-indoc" ,rust-indoc-1) + ("rust-pretty-assertions" ,rust-pretty-assertions-0.7)))))) + (define-public rust-pulldown-cmark-0.4 (package (inherit rust-pulldown-cmark-0.8) @@ -51071,37 +58022,6 @@ in codeblocks, while assuring quality with a powerful test suite.") (("rust-bitflags" ,rust-bitflags-0.9) ("rust-getopts" ,rust-getopts-0.2)))))) -(define-public rust-pulldown-cmark-to-cmark-7 - (package - (name "rust-pulldown-cmark-to-cmark") - (version "7.1.1") - (source - (origin - (method url-fetch) - (uri (crate-uri "pulldown-cmark-to-cmark" version)) - (file-name - (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "03f6bnqjzchmzs4qaf63pirgj95b0x3l2rlp1wj1z27mp734phcb")))) - (build-system cargo-build-system) - (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-pulldown-cmark" ,rust-pulldown-cmark-0.8)) - #:cargo-development-inputs - (("rust-indoc" ,rust-indoc-1) - ("rust-pretty-assertions" - ,rust-pretty-assertions-0.7)))) - (home-page - "https://github.com/Byron/pulldown-cmark-to-cmark") - (synopsis - "Convert pulldown-cmark Events back to the string they were parsed from") - (description - "This package provides a convert pulldown-cmark Events back to the string -they were parsed from") - (license license:asl2.0))) - (define-public rust-pulse-0.5 (package (name "rust-pulse") @@ -51159,17 +58079,37 @@ they were parsed from") (arguments (list #:tests? #f)))) ; Not all files included. -(define-public rust-pyo3-build-config-0.20 +(define-public rust-pwd-1 + (package + (name "rust-pwd") + (version "1.4.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "pwd" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "18p4j95sqqcxn3fbm6gbi7klxp8n40xmcjqy9vz1ww5rg461rivj")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2) + ("rust-thiserror" ,rust-thiserror-1)))) + (home-page "https://gitlab.com/pwoolcoc/pwd.git") + (synopsis "Safe interface to pwd.h") + (description "This package provides a safe interface to @code{pwd.h}.") + (license license:public-domain))) + +(define-public rust-pyo3-build-config-0.21 (package (name "rust-pyo3-build-config") - (version "0.20.2") + (version "0.21.2") (source (origin (method url-fetch) (uri (crate-uri "pyo3-build-config" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1gk3a4y8jc2z1j3hb9xjg1gfvcd7s6ph1wwkcbr039p5iw6nyhh7")))) + (base32 "0l0vxvnqsbjrpdmysnwaljf4q3zcr1kb526qq23svzgs6mcdz0vq")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-once-cell" ,rust-once-cell-1) @@ -51185,6 +58125,25 @@ they were parsed from") ecosystem.") (license (list license:expat license:asl2.0)))) +(define-public rust-pyo3-build-config-0.20 + (package + (inherit rust-pyo3-build-config-0.21) + (name "rust-pyo3-build-config") + (version "0.20.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "pyo3-build-config" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1ms83n1qa81989c6pakpznifalvxv5fiyyji23732lizvr2mgany")))) + (arguments + `(#:cargo-inputs (("rust-once-cell" ,rust-once-cell-1) + ("rust-python3-dll-a" ,rust-python3-dll-a-0.2) + ("rust-python3-dll-a" ,rust-python3-dll-a-0.2) + ("rust-target-lexicon" ,rust-target-lexicon-0.12) + ("rust-target-lexicon" ,rust-target-lexicon-0.12)))))) + (define-public rust-pyo3-build-config-0.19 (package (inherit rust-pyo3-build-config-0.20) @@ -51224,14 +58183,14 @@ ecosystem.") (define-public rust-pyo3-build-config-0.16 (package (name "rust-pyo3-build-config") - (version "0.16.5") + (version "0.16.6") (source (origin (method url-fetch) (uri (crate-uri "pyo3-build-config" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1j2jj5qnnpagi3gvkwjpydcxfsd5qv3vmpghnaqs7n1mdia5pdmm")))) + (base32 "1hndr61lxc2kw7wnnggps3h08lnsqapwa3lxc0l5ji2rg0wrv0cw")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -51262,21 +58221,22 @@ ecosystem.") `(#:cargo-inputs (("rust-once-cell" ,rust-once-cell-1)))))) -(define-public rust-pyo3-ffi-0.20 +(define-public rust-pyo3-ffi-0.21 (package (name "rust-pyo3-ffi") - (version "0.20.2") + (version "0.21.2") (source (origin (method url-fetch) (uri (crate-uri "pyo3-ffi" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1wbcv9cd0bandh3j5qfd5r66n045b8hs9wd4pi36nxhpgv0xxdyv")))) + (base32 "00vlp4gmzn76gz250pz1r3fydd5r41nwl7dd9nmidfb0vi1migh1")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2) - ("rust-pyo3-build-config" ,rust-pyo3-build-config-0.20)))) + `(#:cargo-inputs + (("rust-libc" ,rust-libc-0.2) + ("rust-pyo3-build-config" ,rust-pyo3-build-config-0.21)))) (native-inputs (list python)) (home-page "https://github.com/pyo3/pyo3") (synopsis "Python API bindings for the PyO3 ecosystem") @@ -51284,6 +58244,23 @@ ecosystem.") "This crate provides Rust FFI declarations for Python 3.") (license (list license:expat license:asl2.0)))) +(define-public rust-pyo3-ffi-0.20 + (package + (inherit rust-pyo3-ffi-0.21) + (name "rust-pyo3-ffi") + (version "0.20.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "pyo3-ffi" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1yja1npmzh4i73jn5dv2rnw7idif8bns51bf3zpx821ys0qjbd32")))) + (arguments + `(#:cargo-inputs + (("rust-libc" ,rust-libc-0.2) + ("rust-pyo3-build-config" ,rust-pyo3-build-config-0.20)))))) + (define-public rust-pyo3-ffi-0.19 (package (inherit rust-pyo3-ffi-0.20) @@ -51322,17 +58299,16 @@ ecosystem.") (package (inherit rust-pyo3-ffi-0.19) (name "rust-pyo3-ffi") - (version "0.16.5") + (version "0.16.6") (source (origin (method url-fetch) (uri (crate-uri "pyo3-ffi" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0avls4q393nmzhb124zg6kp5lj6xzy2f6qx564qa7b614xqs0xf2")))) + "0pzpcmndak7y72p4rw494cki1bxh86diiqdzsw14gxammc1jg26a")))) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2) ("rust-pyo3-build-config" ,rust-pyo3-build-config-0.16)))))) @@ -51363,29 +58339,50 @@ ecosystem.") extension to python.") (license (list license:asl2.0 license:expat)))) -(define-public rust-pyo3-macros-backend-0.20 +(define-public rust-pyo3-macros-backend-0.21 (package (name "rust-pyo3-macros-backend") - (version "0.20.2") + (version "0.21.2") (source (origin (method url-fetch) (uri (crate-uri "pyo3-macros-backend" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "07w8x1wxm1ksx72jb0w1p2ssmg9zh95dsv4xmxyq4iqqhpa11j8g")))) + (base32 "0p58yp8ajlc8bq56wghw1syrjszmadasasdfpsjy3d9dychhf9h8")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-heck" ,rust-heck-0.4) ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-pyo3-build-config" ,rust-pyo3-build-config-0.21) ("rust-quote" ,rust-quote-1) ("rust-syn" ,rust-syn-2)))) + (native-inputs (list python-minimal)) (home-page "https://github.com/pyo3/pyo3") (synopsis "Code generation for PyO3") (description "This package provides code generation backends for PyO3.") (license (list license:expat license:asl2.0)))) +(define-public rust-pyo3-macros-backend-0.20 + (package + (inherit rust-pyo3-macros-backend-0.21) + (name "rust-pyo3-macros-backend") + (version "0.20.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "pyo3-macros-backend" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "11b1z7qnbdnd9hy74ds3xcjx3mjkz43mvpnan32ljccwpdl9nzkw")))) + (arguments + `(#:cargo-inputs (("rust-heck" ,rust-heck-0.4) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-pyo3-build-config" ,rust-pyo3-build-config-0.20) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-2)))))) + (define-public rust-pyo3-macros-backend-0.19 (package (inherit rust-pyo3-macros-backend-0.20) @@ -51402,7 +58399,8 @@ extension to python.") `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) ("rust-quote" ,rust-quote-1) - ("rust-syn" ,rust-syn-1)))))) + ("rust-syn" ,rust-syn-1)))) + (native-inputs '()))) (define-public rust-pyo3-macros-backend-0.18 (package @@ -51426,19 +58424,17 @@ extension to python.") (package (inherit rust-pyo3-macros-backend-0.19) (name "rust-pyo3-macros-backend") - (version "0.16.5") + (version "0.16.6") (source (origin (method url-fetch) (uri (crate-uri "pyo3-macros-backend" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1bvzvdx2a6hhliny12n2vy7v7gbsgzanxjckjr1cbxbkizss1gak")))) + "1f0y9vxmyq1cidk544pwg3my30f6xfqfgf42grw4gx4q5pl687v1")))) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) - ("rust-pyo3-build-config" ,rust-pyo3-build-config-0.16) ("rust-quote" ,rust-quote-1) ("rust-syn" ,rust-syn-1)))))) @@ -51462,29 +58458,50 @@ extension to python.") ("rust-syn" ,rust-syn-1)))) (native-inputs (list python)))) -(define-public rust-pyo3-macros-0.20 +(define-public rust-pyo3-macros-0.21 (package (name "rust-pyo3-macros") - (version "0.20.2") + (version "0.21.2") (source (origin (method url-fetch) (uri (crate-uri "pyo3-macros" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1lsfyx1shdyi7zybs3maakh2h3zsij3l5wap35qval0dwjs3ixq5")))) + (base32 "0g65z9yj2iffjrkrkzan9hwhhj7rrchh7lfv64dy30h6zill1cvp")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) - ("rust-pyo3-macros-backend" ,rust-pyo3-macros-backend-0.20) - ("rust-quote" ,rust-quote-1) - ("rust-syn" ,rust-syn-2)))) + `(#:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-pyo3-macros-backend" ,rust-pyo3-macros-backend-0.21) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-2)))) + (native-inputs (list python-minimal)) (home-page "https://github.com/pyo3/pyo3") (synopsis "Proc macros for PyO3") (description "This package provides compiler macros for use with PyO3.") (license (list license:expat license:asl2.0)))) +(define-public rust-pyo3-macros-0.20 + (package + (inherit rust-pyo3-macros-0.21) + (name "rust-pyo3-macros") + (version "0.20.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "pyo3-macros" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0n61s98qb2qc1wlda3bz4r0wi0vsr9p4lj2yr5g0bf01z8hcf1bk")))) + (arguments + `(#:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-pyo3-macros-backend" ,rust-pyo3-macros-backend-0.20) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-2)))))) + (define-public rust-pyo3-macros-0.19 (package (inherit rust-pyo3-macros-0.20) @@ -51502,7 +58519,8 @@ extension to python.") (("rust-proc-macro2" ,rust-proc-macro2-1) ("rust-pyo3-macros-backend" ,rust-pyo3-macros-backend-0.19) ("rust-quote" ,rust-quote-1) - ("rust-syn" ,rust-syn-1)))))) + ("rust-syn" ,rust-syn-1)))) + (native-inputs '()))) (define-public rust-pyo3-macros-0.18 (package @@ -51546,18 +58564,18 @@ extension to python.") (package (inherit rust-pyo3-macros-0.19) (name "rust-pyo3-macros") - (version "0.16.5") + (version "0.16.6") (source (origin (method url-fetch) (uri (crate-uri "pyo3-macros" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1xwh7sl4n73746q80n5m5afd261zg0kxcqfnlr89ik7vbd4c8kr8")))) + (base32 "089z1x8fm7078kyhpjcsaipd6745jf2rp86rpbkppbam5504k1sn")))) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-pyo3-macros-backend" ,rust-pyo3-macros-backend-0.16) + `(#:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-pyo3-macros-backend" ,rust-pyo3-macros-backend-0.16) ("rust-quote" ,rust-quote-1) ("rust-syn" ,rust-syn-1)))))) @@ -51580,22 +58598,23 @@ extension to python.") ("rust-syn" ,rust-syn-1)))) (native-inputs (list python)))) -(define-public rust-pyo3-0.20 +(define-public rust-pyo3-0.21 (package (name "rust-pyo3") - (version "0.20.2") + (version "0.21.2") (source (origin (method url-fetch) (uri (crate-uri "pyo3" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1q3g7ppg2qskigbgqg3w9280klkil5is9hhyps1ykl2hb1xdr2cs")))) + (base32 "1n39y183jfqbyvimscqr0ysxxa6804pn46ivw048ww91lnb0pq55")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-anyhow" ,rust-anyhow-1) ("rust-cfg-if" ,rust-cfg-if-1) ("rust-chrono" ,rust-chrono-0.4) + ("rust-chrono-tz" ,rust-chrono-tz-0.6) ("rust-either" ,rust-either-1) ("rust-eyre" ,rust-eyre-0.6) ("rust-hashbrown" ,rust-hashbrown-0.14) @@ -51607,22 +58626,24 @@ extension to python.") ("rust-num-bigint" ,rust-num-bigint-0.4) ("rust-num-complex" ,rust-num-complex-0.4) ("rust-parking-lot" ,rust-parking-lot-0.12) - ("rust-pyo3-build-config" ,rust-pyo3-build-config-0.20) - ("rust-pyo3-ffi" ,rust-pyo3-ffi-0.20) - ("rust-pyo3-macros" ,rust-pyo3-macros-0.20) + ("rust-portable-atomic" ,rust-portable-atomic-1) + ("rust-pyo3-build-config" ,rust-pyo3-build-config-0.21) + ("rust-pyo3-ffi" ,rust-pyo3-ffi-0.21) + ("rust-pyo3-macros" ,rust-pyo3-macros-0.21) ("rust-rust-decimal" ,rust-rust-decimal-1) ("rust-serde" ,rust-serde-1) ("rust-smallvec" ,rust-smallvec-1) ("rust-unindent" ,rust-unindent-0.2)) #:cargo-development-inputs (("rust-assert-approx-eq" ,rust-assert-approx-eq-1) ("rust-chrono" ,rust-chrono-0.4) + ("rust-chrono-tz" ,rust-chrono-tz-0.6) + ("rust-futures" ,rust-futures-0.3) ("rust-proptest" ,rust-proptest-1) ("rust-rayon" ,rust-rayon-1) ("rust-send-wrapper" ,rust-send-wrapper-0.6) ("rust-serde" ,rust-serde-1) ("rust-serde-json" ,rust-serde-json-1) - ("rust-trybuild" ,rust-trybuild-1) - ("rust-widestring" ,rust-widestring-0.5)))) + ("rust-trybuild" ,rust-trybuild-1)))) (inputs (list python)) (home-page "https://github.com/pyo3/pyo3") (synopsis "Rust bindings for the Python interpreter") @@ -51632,6 +58653,50 @@ creating native Python extension modules. Running and interacting with Python code from a Rust binary is also supported.") (license (list license:expat license:asl2.0)))) +(define-public rust-pyo3-0.20 + (package + (inherit rust-pyo3-0.21) + (name "rust-pyo3") + (version "0.20.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "pyo3" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0cw2pgab0pq5gd98nhv18xgxvyigygspla6c8mfycmwisjbbpgak")))) + (arguments + `(#:cargo-inputs (("rust-anyhow" ,rust-anyhow-1) + ("rust-cfg-if" ,rust-cfg-if-1) + ("rust-chrono" ,rust-chrono-0.4) + ("rust-either" ,rust-either-1) + ("rust-eyre" ,rust-eyre-0.6) + ("rust-hashbrown" ,rust-hashbrown-0.14) + ("rust-indexmap" ,rust-indexmap-2) + ("rust-indoc" ,rust-indoc-2) + ("rust-inventory" ,rust-inventory-0.3) + ("rust-libc" ,rust-libc-0.2) + ("rust-memoffset" ,rust-memoffset-0.9) + ("rust-num-bigint" ,rust-num-bigint-0.4) + ("rust-num-complex" ,rust-num-complex-0.4) + ("rust-parking-lot" ,rust-parking-lot-0.12) + ("rust-pyo3-build-config" ,rust-pyo3-build-config-0.20) + ("rust-pyo3-ffi" ,rust-pyo3-ffi-0.20) + ("rust-pyo3-macros" ,rust-pyo3-macros-0.20) + ("rust-rust-decimal" ,rust-rust-decimal-1) + ("rust-serde" ,rust-serde-1) + ("rust-smallvec" ,rust-smallvec-1) + ("rust-unindent" ,rust-unindent-0.2)) + #:cargo-development-inputs (("rust-assert-approx-eq" ,rust-assert-approx-eq-1) + ("rust-chrono" ,rust-chrono-0.4) + ("rust-proptest" ,rust-proptest-1) + ("rust-rayon" ,rust-rayon-1) + ("rust-send-wrapper" ,rust-send-wrapper-0.6) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-trybuild" ,rust-trybuild-1) + ("rust-widestring" ,rust-widestring-0.5)))))) + (define-public rust-pyo3-0.19 (package (inherit rust-pyo3-0.20) @@ -51734,14 +58799,14 @@ Python code from a Rust binary is also supported.") (package (inherit rust-pyo3-0.19) (name "rust-pyo3") - (version "0.16.5") + (version "0.16.6") (source (origin (method url-fetch) (uri (crate-uri "pyo3" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1p5kjsj3jdw2gnahdjrzljmi93w3nxdp11qq8x3i80b0a3l04qqy")))) + (base32 "1jn6nhp9a8i5kfwds6fzy3hzb938qim8bajp8gfkkcn9892c8802")))) (arguments `(#:cargo-inputs (("rust-anyhow" ,rust-anyhow-1) @@ -51755,7 +58820,6 @@ Python code from a Rust binary is also supported.") ("rust-num-bigint" ,rust-num-bigint-0.4) ("rust-num-complex" ,rust-num-complex-0.4) ("rust-parking-lot" ,rust-parking-lot-0.11) - ("rust-paste" ,rust-paste-0.1) ("rust-pyo3-build-config" ,rust-pyo3-build-config-0.16) ("rust-pyo3-ffi" ,rust-pyo3-ffi-0.16) ("rust-pyo3-macros" ,rust-pyo3-macros-0.16) @@ -51763,16 +58827,15 @@ 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-criterion" ,rust-criterion-0.3) - ("rust-half" ,rust-half-1) ("rust-proptest" ,rust-proptest-0.10) ("rust-rustversion" ,rust-rustversion-1) ("rust-send-wrapper" ,rust-send-wrapper-0.5) + ("rust-serde" ,rust-serde-1) ("rust-serde-json" ,rust-serde-json-1) ("rust-trybuild" ,rust-trybuild-1) ("rust-widestring" ,rust-widestring-0.5)) - ;; FIXME: fails to initialize Python interpreter. + ;; SIGSEGV: invalid memory reference #:tests? #f)))) (define-public rust-pyo3-macros-0.13 @@ -51979,6 +59042,26 @@ Python code from a Rust binary is also supported.") ("rust-zip" ,rust-zip-0.6)) #:cargo-development-inputs (("rust-serde-json" ,rust-serde-json-1)))))) +(define-public rust-quad-rand-0.2 + (package + (name "rust-quad-rand") + (version "0.2.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "quad-rand" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "125bw7b295khgwk7bnb6vkcdjyki1xbfzrcygh2mzk54yzxa33v5")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-rand" ,rust-rand-0.8)))) + (home-page "https://github.com/not-fl3/quad-rand") + (synopsis "Pseudo random implementation with std atomics") + (description + "This package provides a pseudo random implementation with std atomics.") + (license license:expat))) + (define-public rust-quantiles-0.7 (package (name "rust-quantiles") @@ -52160,6 +59243,20 @@ to write.") ("rust-tokio" ,rust-tokio-1) ("rust-tokio-test" ,rust-tokio-test-0.4)))))) +(define-public rust-quick-xml-0.26 + (package + (inherit rust-quick-xml-0.27) + (name "rust-quick-xml") + (version "0.26.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "quick-xml" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1kckgj8qscpi23y62zrfmni73k6h78nvhs3z9myiwq9q7g3b2l3z")))))) + (define-public rust-quick-xml-0.22 (package (inherit rust-quick-xml-0.27) @@ -53615,6 +60712,32 @@ generators.") #:cargo-development-inputs (("rust-bincode" ,rust-bincode-1)))))) +(define-public rust-rand-regex-0.15 + (package + (name "rust-rand-regex") + (version "0.15.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "rand_regex" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1gfgx78k1sf3y5z7hf3rn8qnplmvlm908y6ig4razvnrszi9yalb")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; Tests segfault. + #:cargo-inputs (("rust-rand" ,rust-rand-0.8) + ("rust-regex-syntax" ,rust-regex-syntax-0.6)) + #:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.3) + ("rust-rand" ,rust-rand-0.8) + ("rust-rand-distr" ,rust-rand-distr-0.4) + ("rust-rand-xorshift" ,rust-rand-xorshift-0.3) + ("rust-regex" ,rust-regex-1)))) + (home-page "https://github.com/kennytm/rand_regex") + (synopsis "Generates random strings and byte strings matching a regex") + (description "Generates random strings and byte strings matching a regex.") + (license license:expat))) + (define-public rust-rand-xorshift-0.3 (package (name "rust-rand-xorshift") @@ -53847,8 +60970,161 @@ random generic types.") (license (list license:zlib license:asl2.0 license:expat)))) +(define-public rust-ratatui-0.26 + (package + (name "rust-ratatui") + (version "0.26.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "ratatui" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1n1ivnbpng797ssrw1rv1i0j4sjgylm3bssn1m5n2qkcpy7jzcdw")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-test-flags + '("--release" "--" + "--skip=buffer::tests::index_of_panics_on_out_of_bounds" + "--skip=buffer::tests::pos_of_panics_on_out_of_bounds" + "--skip=buffer::Buffer::index_of" + "--skip=buffer::Buffer::pos_of" + "--skip=terminal::frame::Frame" + "--skip=src/widgets.rs") + #:cargo-inputs (("rust-bitflags" ,rust-bitflags-2) + ("rust-cassowary" ,rust-cassowary-0.3) + ("rust-compact-str" ,rust-compact-str-0.7) + ("rust-crossterm" ,rust-crossterm-0.27) + ("rust-document-features" ,rust-document-features-0.2) + ("rust-indoc" ,rust-indoc-2) + ("rust-itertools" ,rust-itertools-0.12) + ("rust-lru" ,rust-lru-0.12) + ("rust-paste" ,rust-paste-1) + ("rust-serde" ,rust-serde-1) + ("rust-stability" ,rust-stability-0.1) + ("rust-strum" ,rust-strum-0.26) + ("rust-termion" ,rust-termion-3) + ("rust-termwiz" ,rust-termwiz-0.22) + ("rust-time" ,rust-time-0.3) + ("rust-unicode-segmentation" ,rust-unicode-segmentation-1) + ("rust-unicode-width" ,rust-unicode-width-0.1)) + #:cargo-development-inputs (("rust-anyhow" ,rust-anyhow-1) + ("rust-argh" ,rust-argh-0.1) + ("rust-better-panic" ,rust-better-panic-0.3) + ("rust-cargo-husky" ,rust-cargo-husky-1) + ("rust-color-eyre" ,rust-color-eyre-0.6) + ("rust-criterion" ,rust-criterion-0.5) + ("rust-derive-builder" ,rust-derive-builder-0.13) + ("rust-fakeit" ,rust-fakeit-1) + ("rust-font8x8" ,rust-font8x8-0.3) + ("rust-palette" ,rust-palette-0.7) + ("rust-pretty-assertions" ,rust-pretty-assertions-1) + ("rust-rand" ,rust-rand-0.8) + ("rust-rand-chacha" ,rust-rand-chacha-0.3) + ("rust-rstest" ,rust-rstest-0.18) + ("rust-serde-json" ,rust-serde-json-1)))) + (home-page "https://github.com/ratatui-org/ratatui") + (synopsis "Library for cooking up terminal user interfaces") + (description + "This package provides a library that's all about cooking up terminal user +interfaces.") + (license license:expat))) + +(define-public rust-ratatui-0.25 + (package + (inherit rust-ratatui-0.26) + (name "rust-ratatui") + (version "0.25.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "ratatui" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1sw0s4s9y09n2nsxs996frrlmy4fay7ibwfrvar0fvmswi99wrd5")))) + (arguments + `(#:cargo-test-flags + '("--release" "--" + "--skip=buffer::tests::index_of_panics_on_out_of_bounds" + "--skip=buffer::tests::pos_of_panics_on_out_of_bounds" + "--skip=buffer::Buffer::index_of" + "--skip=buffer::Buffer::pos_of") + #:cargo-inputs (("rust-bitflags" ,rust-bitflags-2) + ("rust-cassowary" ,rust-cassowary-0.3) + ("rust-crossterm" ,rust-crossterm-0.27) + ("rust-document-features" ,rust-document-features-0.2) + ("rust-indoc" ,rust-indoc-2) + ("rust-itertools" ,rust-itertools-0.12) + ("rust-lru" ,rust-lru-0.12) + ("rust-paste" ,rust-paste-1) + ("rust-serde" ,rust-serde-1) + ("rust-stability" ,rust-stability-0.1) + ("rust-strum" ,rust-strum-0.25) + ("rust-termion" ,rust-termion-2) + ("rust-termwiz" ,rust-termwiz-0.20) + ("rust-time" ,rust-time-0.3) + ("rust-unicode-segmentation" ,rust-unicode-segmentation-1) + ("rust-unicode-width" ,rust-unicode-width-0.1)) + #:cargo-development-inputs + (("rust-anyhow" ,rust-anyhow-1) + ("rust-argh" ,rust-argh-0.1) + ("rust-better-panic" ,rust-better-panic-0.3) + ("rust-cargo-husky" ,rust-cargo-husky-1) + ("rust-color-eyre" ,rust-color-eyre-0.6) + ("rust-criterion" ,rust-criterion-0.5) + ("rust-fakeit" ,rust-fakeit-1) + ("rust-palette" ,rust-palette-0.7) + ("rust-pretty-assertions" ,rust-pretty-assertions-1) + ("rust-rand" ,rust-rand-0.8)))))) + +(define-public rust-ratatui-0.24 + (package + (inherit rust-ratatui-0.26) + (name "rust-ratatui") + (version "0.24.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "ratatui" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "099433has5bhl6zbckpv2qskb66h7xz4rfgc6xn5cyjjzdy93g0f")))) + (arguments + `(#:cargo-test-flags + '("--release" "--" + "--skip=buffer::tests::index_of_panics_on_out_of_bounds" + "--skip=buffer::tests::pos_of_panics_on_out_of_bounds" + "--skip=buffer::Buffer::index_of" + "--skip=buffer::Buffer::pos_of") + #:cargo-inputs (("rust-bitflags" ,rust-bitflags-2) + ("rust-cassowary" ,rust-cassowary-0.3) + ("rust-crossterm" ,rust-crossterm-0.27) + ("rust-document-features" ,rust-document-features-0.2) + ("rust-indoc" ,rust-indoc-2) + ("rust-itertools" ,rust-itertools-0.11) + ("rust-lru" ,rust-lru-0.12) + ("rust-paste" ,rust-paste-1) + ("rust-serde" ,rust-serde-1) + ("rust-strum" ,rust-strum-0.25) + ("rust-termion" ,rust-termion-2) + ("rust-termwiz" ,rust-termwiz-0.20) + ("rust-time" ,rust-time-0.3) + ("rust-unicode-segmentation" ,rust-unicode-segmentation-1) + ("rust-unicode-width" ,rust-unicode-width-0.1)) + #:cargo-development-inputs + (("rust-anyhow" ,rust-anyhow-1) + ("rust-argh" ,rust-argh-0.1) + ("rust-better-panic" ,rust-better-panic-0.3) + ("rust-cargo-husky" ,rust-cargo-husky-1) + ("rust-criterion" ,rust-criterion-0.5) + ("rust-fakeit" ,rust-fakeit-1) + ("rust-palette" ,rust-palette-0.7) + ("rust-pretty-assertions" ,rust-pretty-assertions-1) + ("rust-rand" ,rust-rand-0.8)))))) + (define-public rust-ratatui-0.20 (package + (inherit rust-ratatui-0.24) (name "rust-ratatui") (version "0.20.1") (source @@ -53858,7 +61134,6 @@ random generic types.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "0ab8w62dkp2c2l8s1xb904imqlv7aqkc07hm6bp01afbphrd1h6w")))) - (build-system cargo-build-system) (arguments `(#:cargo-test-flags '("--release" "--" @@ -53874,15 +61149,8 @@ random generic types.") ("rust-termion" ,rust-termion-2) ("rust-unicode-segmentation" ,rust-unicode-segmentation-1) ("rust-unicode-width" ,rust-unicode-width-0.1)) - #:cargo-development-inputs - (("rust-argh" ,rust-argh-0.1) - ("rust-rand" ,rust-rand-0.8)))) - (home-page "https://github.com/ratatui-org/ratatui") - (synopsis "Library for cooking up terminal user interfaces") - (description - "This package provides a library that's all about cooking up terminal user -interfaces.") - (license license:expat))) + #:cargo-development-inputs (("rust-argh" ,rust-argh-0.1) + ("rust-rand" ,rust-rand-0.8)))))) (define-public rust-raw-cpuid-10 (package @@ -54007,19 +61275,20 @@ accessors.") (define-public rust-rayon-1 (package (name "rust-rayon") - (version "1.8.0") + (version "1.10.0") (source (origin (method url-fetch) (uri (crate-uri "rayon" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1cfdnvchf7j4cpha5jkcrrsr61li9i9lp5ak7xdq6d3pvc1xn9ww")))) + (base32 "1ylgnzwgllajalr4v00y4kj22klq2jbwllm70aha232iah0sc65l")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-either" ,rust-either-1) - ("rust-rayon-core" ,rust-rayon-core-1)) + ("rust-rayon-core" ,rust-rayon-core-1) + ("rust-wasm-sync" ,rust-wasm-sync-0.1)) #:cargo-development-inputs (("rust-rand" ,rust-rand-0.8) ("rust-rand-xorshift" ,rust-rand-xorshift-0.3)))) @@ -54081,20 +61350,20 @@ Rust.") (define-public rust-rayon-core-1 (package (name "rust-rayon-core") - (version "1.12.0") + (version "1.12.1") (source (origin (method url-fetch) (uri (crate-uri "rayon-core" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1vaq0q71yfvcwlmia0iqf6ixj2fibjcf2xjy92n1m1izv1mgpqsw")))) + (base32 "1qpwim68ai5h0j7axa8ai8z0payaawv3id0lrgkqmapx7lx8fr8l")))) (build-system cargo-build-system) (arguments - `(#:tests? #f ; `Sender<usize>` cannot be shared between threads safely - #:cargo-inputs + `(#:cargo-inputs (("rust-crossbeam-deque" ,rust-crossbeam-deque-0.8) - ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.8)) + ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.8) + ("rust-wasm-sync" ,rust-wasm-sync-0.1)) #:cargo-development-inputs (("rust-libc" ,rust-libc-0.2) ("rust-rand" ,rust-rand-0.8) @@ -54105,6 +61374,29 @@ Rust.") (description "This package provides core APIs for Rayon.") (license (list license:asl2.0 license:expat)))) +(define-public rust-rclite-0.2 + (package + (name "rust-rclite") + (version "0.2.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "rclite" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1fa379adiwincgywigi341zd969d3459ljq71n5ymwwficp0r7zf")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-branches" ,rust-branches-0.1)) + #:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.4) + ("rust-rayon" ,rust-rayon-1)))) + (home-page "https://github.com/fereidani/rclite") + (synopsis "Reference counting compatible with Arc and Rc APIs") + (description + "This package provides reference counting, which is compatible with +Arc and Rc APIs.") + (license (list license:expat license:asl2.0)))) + (define-public rust-rctree-0.5 (package (name "rust-rctree") @@ -54161,6 +61453,49 @@ reference counting.") @code{rdrand} and @code{rdseed} instructions") (license license:isc))) +(define-public rust-readlock-0.1 + (package + (name "rust-readlock") + (version "0.1.7") + (source + (origin + (method url-fetch) + (uri (crate-uri "readlock" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "18l0la7zxavbw1ppfigq84f994lyw65rbpl4hlf5gakd37kj7cyp")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-rclite" ,rust-rclite-0.2)))) + (home-page "https://github.com/jplatte/readlock") + (synopsis "Weird alternative to Arc<RwLock<T>>") + (description + "This package provides a weird alternative to @code{Arc<RwLock<T>>}.") + (license license:mpl2.0))) + +(define-public rust-readlock-tokio-0.1 + (package + (name "rust-readlock-tokio") + (version "0.1.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "readlock-tokio" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1zc356rp6x0imb4rq2jyq238lv065h4gnyr7zsh3c6aj0s4kd8zv")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-rclite" ,rust-rclite-0.2) + ("rust-tokio" ,rust-tokio-1)) + #:cargo-development-inputs (("rust-tokio" ,rust-tokio-1)))) + (home-page "https://github.com/jplatte/readlock") + (synopsis "Weird alternative to Arc<RwLock<T>> using tokio's RwLock") + (description + "This package provides a weird alternative to Arc<@code{RwLock<T>>}, +using tokio's @code{RwLock}") + (license license:mpl2.0))) + (define-public rust-recycler-0.1 (package (name "rust-recycler") @@ -54182,22 +61517,22 @@ reference counting.") owned memory.") (license license:expat))) -(define-public rust-redox-syscall-0.4 +(define-public rust-redox-syscall-0.5 (package (name "rust-redox-syscall") - (version "0.4.1") + (version "0.5.1") (source (origin (method url-fetch) (uri (crate-uri "redox_syscall" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1aiifyz5dnybfvkk4cdab9p2kmphag1yad6iknc7aszlxxldf8j7")))) + (base32 "0zja6y3av9z50gg1hh0vsc053941wng21r43whhk8mfb9n4m5426")))) (build-system cargo-build-system) (arguments - `(#:tests? #f ; could not find `CloneFlags` in the crate root + `(#:tests? #f ; Functions not implemented on Linux. #:cargo-inputs - (("rust-bitflags" ,rust-bitflags-1) + (("rust-bitflags" ,rust-bitflags-2) ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1)))) (home-page "https://gitlab.redox-os.org/redox-os/syscall") (synopsis "Rust library to access raw Redox system calls") @@ -54205,6 +61540,24 @@ owned memory.") "This package provides a Rust library to access raw Redox system calls.") (license license:expat))) +(define-public rust-redox-syscall-0.4 + (package + (inherit rust-redox-syscall-0.5) + (name "rust-redox-syscall") + (version "0.4.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "redox_syscall" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1aiifyz5dnybfvkk4cdab9p2kmphag1yad6iknc7aszlxxldf8j7")))) + (arguments + `(#:tests? #f ; could not find `CloneFlags` in the crate root + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-1) + ("rust-rustc-std-workspace-core" ,rust-rustc-std-workspace-core-1)))))) + (define-public rust-redox-syscall-0.3 (package (inherit rust-redox-syscall-0.4) @@ -54279,21 +61632,22 @@ owned memory.") (define-public rust-redox-users-0.4 (package (name "rust-redox-users") - (version "0.4.0") + (version "0.4.5") (source (origin (method url-fetch) (uri (crate-uri "redox_users" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0r5y1a26flkn6gkayi558jg5dzh2m2fdsapgkpn7mj01v3rk51aj")))) + (base32 "1498qyfyc2k3ih5aaffddvbhzi36na8iqg54hcm4pnpfa6b3sa5x")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-getrandom" ,rust-getrandom-0.2) - ("rust-redox-syscall" ,rust-redox-syscall-0.2) - ("rust-rust-argon2" ,rust-rust-argon2-0.8)))) + ("rust-libredox" ,rust-libredox-0.1) + ("rust-rust-argon2" ,rust-rust-argon2-0.8) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-zeroize" ,rust-zeroize-1)))) (home-page "https://gitlab.redox-os.org/redox-os/users") (synopsis "Rust library to access Redox users and groups functionality") (description @@ -54342,6 +61696,46 @@ functionality") initial value.") (license (list license:expat license:asl2.0)))) +(define-public rust-reedline-0.30 + (package + (name "rust-reedline") + (version "0.30.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "reedline" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1z5q65x873112q2a3rpsrnvb12widbxmp5qymv9kgjfqlnk9yfj1")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-arboard" ,rust-arboard-3) + ("rust-chrono" ,rust-chrono-0.4) + ("rust-crossbeam" ,rust-crossbeam-0.8) + ("rust-crossterm" ,rust-crossterm-0.27) + ("rust-fd-lock" ,rust-fd-lock-3) + ("rust-itertools" ,rust-itertools-0.12) + ("rust-nu-ansi-term" ,rust-nu-ansi-term-0.50) + ("rust-rusqlite" ,rust-rusqlite-0.31) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-strip-ansi-escapes" ,rust-strip-ansi-escapes-0.2) + ("rust-strum" ,rust-strum-0.25) + ("rust-strum-macros" ,rust-strum-macros-0.25) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-unicode-segmentation" ,rust-unicode-segmentation-1) + ("rust-unicode-width" ,rust-unicode-width-0.1)) + #:cargo-development-inputs + (("rust-gethostname" ,rust-gethostname-0.4) + ("rust-pretty-assertions" ,rust-pretty-assertions-1) + ("rust-rstest" ,rust-rstest-0.18) + ("rust-tempfile" ,rust-tempfile-3)))) + (home-page "https://github.com/nushell/reedline") + (synopsis "Readline-like crate for CLI text input") + (description + "This package provides a readline-like crate for CLI text input.") + (license license:expat))) + (define-public rust-ref-cast-1 (package (name "rust-ref-cast") @@ -54460,6 +61854,46 @@ initial value.") (description "Test suite of the ref-cast crate.") (license (list license:expat license:asl2.0)))) +(define-public rust-ref-thread-local-0.1 + (package + (name "rust-ref-thread-local") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "ref_thread_local" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1w7zw42bzywh9jfhlj5dswdh79dk7bvh4mmsamw9jy40lrh1dmd0")))) + (build-system cargo-build-system) + (home-page "https://github.com/Xeiron/ref_thread_local.rs") + (synopsis "Macro for declaring thread-local `static`s") + (description "This package provides a macro for declaring thread-local +`static`s like using both of `lazy_static!` and `@code{RefCell`}") + (license license:expat))) + +(define-public rust-reference-counted-singleton-0.1 + (package + (name "rust-reference-counted-singleton") + (version "0.1.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "reference-counted-singleton" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1fcc50l2xh74r2qn4nx2kk0h4i5ys3v4fhgpg5cz793g00gq8br4")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-development-inputs (("rust-assert-matches" ,rust-assert-matches-1) + ("rust-serial-test" ,rust-serial-test-3)))) + (home-page "https://codeberg.org/koutheir/reference-counted-singleton.git") + (synopsis "Reference-counted singleton with recreatable data") + (description + "This package provides a reference-counted singleton whose protected data +can be recreated as needed.") + (license license:expat))) + (define-public rust-refpool-0.4 (package (name "rust-refpool") @@ -54487,14 +61921,14 @@ memory to speed up reallocation.") (define-public rust-regex-1 (package (name "rust-regex") - (version "1.10.2") + (version "1.10.4") (source (origin (method url-fetch) (uri (crate-uri "regex" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0hxkd814n4irind8im5c9am221ri6bprx49nc7yxv02ykhd9a2rq")))) + (base32 "0k5sb0h2mkwf51ab0gvv3x38jp1q7wgxf63abfbhi0wwvvgxn5y1")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -54575,14 +62009,14 @@ uses finite automata and guarantees linear time matching on all inputs.") (define-public rust-regex-automata-0.4 (package (name "rust-regex-automata") - (version "0.4.3") + (version "0.4.6") (source (origin (method url-fetch) (uri (crate-uri "regex-automata" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0gs8q9yhd3kcg4pr00ag4viqxnh5l7jpyb9fsfr8hzh451w4r02z")))) + (base32 "1spaq7y4im7s56d1gxa2hi4hzf6dwswb1bv8xyavzya7k25kpf46")))) (build-system cargo-build-system) (arguments `(#:tests? #f ; Not all files included. @@ -54658,6 +62092,30 @@ uses finite automata and guarantees linear time matching on all inputs.") ("rust-serde-derive" ,rust-serde-derive-1) ("rust-toml" ,rust-toml-0.5)))))) ; 0.4 +(define-public rust-regex-lite-0.1 + (package + (name "rust-regex-lite") + (version "0.1.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "regex-lite" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "13ndx7ibckvlasyzylqpmwlbp4kahrrdl3ph2sybsdviyar63dih")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; Not all files included. + #:cargo-development-inputs (("rust-anyhow" ,rust-anyhow-1) + ("rust-regex-test" ,rust-regex-test-0.1)))) + (home-page "https://github.com/rust-lang/regex/tree/master/regex-lite") + (synopsis + "Lightweight regex engine optimized for binary size and compilation time") + (description + "This package provides a lightweight regex engine that optimizes for binary +size and compilation time.") + (license (list license:expat license:asl2.0)))) + (define-public rust-regex-syntax-0.8 (package (name "rust-regex-syntax") @@ -55149,6 +62607,74 @@ functionality as retain but gives mutable borrow to the predicate.") MIME Message Headers.") (license license:expat))) +(define-public rust-rhai-1 + (package + (name "rust-rhai") + (version "1.17.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "rhai" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0alqy1jglawbh3wq77axikl0613i3vm81h5yn2jah12d4ir369zn")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-test-flags '("--release" "--" + "--skip=tests::check_struct_sizes") + #:cargo-inputs (("rust-ahash" ,rust-ahash-0.8) + ("rust-arbitrary" ,rust-arbitrary-1) + ("rust-bitflags" ,rust-bitflags-2) + ("rust-core-error" ,rust-core-error-0.0.0) + ("rust-document-features" ,rust-document-features-0.2) + ("rust-getrandom" ,rust-getrandom-0.2) + ("rust-hashbrown" ,rust-hashbrown-0.14) + ("rust-instant" ,rust-instant-0.1) + ("rust-libm" ,rust-libm-0.2) + ("rust-no-std-compat" ,rust-no-std-compat-0.4) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-rhai-codegen" ,rust-rhai-codegen-2) + ("rust-rust-decimal" ,rust-rust-decimal-1) + ("rust-rustyline" ,rust-rustyline-13) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-smallvec" ,rust-smallvec-1) + ("rust-smartstring" ,rust-smartstring-1) + ("rust-thin-vec" ,rust-thin-vec-0.2) + ("rust-unicode-xid" ,rust-unicode-xid-0.2)) + #:cargo-development-inputs (("rust-rmp-serde" ,rust-rmp-serde-1) + ("rust-serde-json" ,rust-serde-json-1)))) + (home-page "https://rhai.rs") + (synopsis "Embedded scripting for Rust") + (description "Embedded scripting for Rust.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-rhai-codegen-2 + (package + (name "rust-rhai-codegen") + (version "2.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "rhai_codegen" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0v45b68rf6yd7z5flryjh8mjb599qis0amff2wx1hj4x9kfgidwx")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; TODO: Only 36/68 tests pass. + #:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-2)) + #:cargo-development-inputs (("rust-rhai" ,rust-rhai-1) + ("rust-trybuild" ,rust-trybuild-1)))) + (home-page "https://rhai.rs/book/plugins/index.html") + (synopsis "Procedural macros support package for Rhai") + (description "This package provides procedural macros support package for +Rhai, a scripting language and engine for Rust.") + (license (list license:expat license:asl2.0)))) + (define-public rust-ringbuf-0.2 (package (name "rust-ringbuf") @@ -55365,6 +62891,34 @@ MessagePack format.") (description "Model a project roadmap as a directed acyclic graph.") (license license:expat-0))) +(define-public rust-rodio-0.15 + (package + (name "rust-rodio") + (version "0.15.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "rodio" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "07kkrx0hxfcqgkpg0lrh9355bj1rl0k65nwsk3qwdri6yvlkj2gc")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-claxon" ,rust-claxon-0.4) + ("rust-cpal" ,rust-cpal-0.13) + ("rust-hound" ,rust-hound-3) + ("rust-lewton" ,rust-lewton-0.10) + ("rust-minimp3" ,rust-minimp3-0.5) + ("rust-symphonia" ,rust-symphonia-0.4)) + #:cargo-development-inputs (("rust-quickcheck" ,rust-quickcheck-0.9)))) + (native-inputs (list pkg-config)) + (inputs (list alsa-lib)) + (home-page "https://github.com/RustAudio/rodio") + (synopsis "Pure Rust audio playback library") + (description "Audio playback library written in pure Rust that supports +many formats including AAC, FLAC, MP3, MP4 and WAV.") + (license (list license:expat license:asl2.0)))) + (define-public rust-roff-0.2 (package (name "rust-roff") @@ -55542,23 +63096,25 @@ network services using futures.") (define-public rust-ropey-1 (package (name "rust-ropey") - (version "1.2.0") + (version "1.6.1") (source (origin (method url-fetch) (uri (crate-uri "ropey" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "10qsj7m6hz953ar68q7iqwwizrh89jaclgffzglb7nwzb0bfzwzh")))) + (base32 "1dckf3likfi1my2ilqwhq2ifsm9iq8cayg6ws7fpa6nd1d11whck")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-smallvec" ,rust-smallvec-1)) + `(#:cargo-inputs + (("rust-smallvec" ,rust-smallvec-1) + ("rust-str-indices" ,rust-str-indices-0.4)) #:cargo-development-inputs - (("rust-bencher" ,rust-bencher-0.1) - ("rust-proptest" ,rust-proptest-0.9) - ("rust-rand" ,rust-rand-0.7) + (("rust-criterion" ,rust-criterion-0.3) + ("rust-fnv" ,rust-fnv-1) + ("rust-fxhash" ,rust-fxhash-0.2) + ("rust-proptest" ,rust-proptest-1) + ("rust-rand" ,rust-rand-0.8) ("rust-unicode-segmentation" ,rust-unicode-segmentation-1)))) (home-page "https://github.com/cessen/ropey") (synopsis "Fast and robust text rope for Rust") @@ -55599,6 +63155,126 @@ can handle huge texts and memory-incoherent edits with ease.") "This package provides a library for generic lossless syntax trees.") (license (list license:expat license:asl2.0)))) +(define-public rust-roxmltree-0.19 + (package + (name "rust-roxmltree") + (version "0.19.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "roxmltree" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0zs0q8hg5nnh91s1ib6r0fky7xm8ay63ayfa5i1afxxpwgalzl9w")))) + (build-system cargo-build-system) + (home-page "https://github.com/RazrFalcon/roxmltree") + (synopsis "Represent an XML as a read-only tree") + (description + "@code{roxmltree} represents an XML 1.0 document as a read-only tree.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-roxmltree-0.14 + (package + (inherit rust-roxmltree-0.19) + (name "rust-roxmltree") + (version "0.14.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "roxmltree" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "010mahzyarkzb7kaawgga1a9y46nsp209yh2i4g4pq98bg8afn5z")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs (("rust-xmlparser" ,rust-xmlparser-0.13)))))) + +(define-public rust-rpassword-7 + (package + (name "rust-rpassword") + (version "7.2.0") + (source (origin + (method url-fetch) + (uri (crate-uri "rpassword" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "08l3jbjwpsj6awm4lacm2bcj3cn9jhy4j6q21n68k49lmdiwyy36")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-libc" ,rust-libc-0.2) + ("rust-rtoolbox" ,rust-rtoolbox-0.0.1) + ("rust-winapi" ,rust-winapi-0.3)))) + (home-page "https://github.com/conradkleinespel/rpassword") + (synopsis "Read passwords in Rust console applications") + (description "This package provides a crate for reading passwords in +console applications.") + (license license:asl2.0))) + +(define-public rust-rpassword-6 + (package + (inherit rust-rpassword-7) + (name "rust-rpassword") + (version "6.0.1") + (source (origin + (method url-fetch) + (uri (crate-uri "rpassword" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0mnrpxvai78mn9wqkqx8wp1gd280jjhn29ixd1dm84l6i2hrkw1b")))) + (arguments + `(#:cargo-inputs + (("rust-libc" ,rust-libc-0.2) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-winapi" ,rust-winapi-0.3)))))) + +(define-public rust-rpassword-5 + (package + (inherit rust-rpassword-6) + (name "rust-rpassword") + (version "5.0.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "rpassword" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1yry1kmgjcb4qd5wak91203493x42ak3dz9hy1c0r9kyib7kdjgz")))) + (arguments + `(#:cargo-inputs + (("rust-libc" ,rust-libc-0.2) + ("rust-winapi" ,rust-winapi-0.3)))))) + +(define-public rust-rpds-1 + (package + (name "rust-rpds") + (version "1.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "rpds" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "194hjbsicmgqi3dyllqrz09mmhh597m2j9l49lr16cyfscambqd0")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-archery" ,rust-archery-1) + ("rust-serde" ,rust-serde-1)) + #:cargo-development-inputs + (("rust-bincode" ,rust-bincode-1) + ("rust-criterion" ,rust-criterion-0.5) + ("rust-pretty-assertions" ,rust-pretty-assertions-1) + ("rust-rand" ,rust-rand-0.8) + ("rust-static-assertions" ,rust-static-assertions-1)))) + (home-page "https://github.com/orium/rpds") + (synopsis "Persistent data structures with structural sharing") + (description "This package provides support for fully persistent data +structures with structural sharing.") + (license license:mpl2.0))) + (define-public rust-rspec-1 (package (name "rust-rspec") @@ -56275,123 +63951,133 @@ tests.") ("rust-rstest" ,rust-rstest-0.15) ("rust-temp-testdir" ,rust-temp-testdir-0.2)))))) -(define-public rust-rug-1 +(define-public rust-rt-format-0.3 (package - (name "rust-rug") - (version "1.14.0") + (name "rust-rt-format") + (version "0.3.1") (source - (origin - (method url-fetch) - (uri (crate-uri "rug" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 "1iw52gyw0hshymqa04g76m7qnrds5vkgc5s8svqx5nv1jz1wrdgm")))) + (origin + (method url-fetch) + (uri (crate-uri "rt-format" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1qjjwh9ny95xck1kp99gi6hfm9glrx54jx8npnj6yccxc7p7q225")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs - (("rust-az" ,rust-az-1) - ("rust-gmp-mpfr-sys" ,rust-gmp-mpfr-sys-1) - ("rust-libc" ,rust-libc-0.2) - ("rust-serde" ,rust-serde-1)) - #:cargo-development-inputs - (("rust-bincode" ,rust-bincode-1) - ("rust-byteorder" ,rust-byteorder-1) - ("rust-serde-json" ,rust-serde-json-1) - ("rust-serde-test" ,rust-serde-test-1)))) - (inputs - (list gmp mpc mpfr)) - (home-page "https://gitlab.com/tspiteri/rug") - (synopsis - "Arbitrary-precision integers, rational, floating-point and complex numbers") - (description "This is a Rust library of arbitrary-precision integers, rational, -floating-point, and complex numbers based on GMP, MPFR and MPC.") - (license license:lgpl3+))) + `(#:skip-build? #t + #:cargo-inputs + (("rust-lazy-static" ,rust-lazy-static-1) + ("rust-regex" ,rust-regex-1)))) + (home-page "https://github.com/vstojkovic/rt-format") + (synopsis "Runtime equivalent of the Rust format! macro") + (description "This package provides a runtime equivalent of the Rust +format! macro. It allows formatting strings like the format! macro, with the +formatting string and the arguments provided at runtime. This crate supports +all the formatting features of the format! macro, except for the fill +character.") + (license license:asl2.0))) -(define-public rust-rpassword-7 +(define-public rust-rtnetlink-0.14 (package - (name "rust-rpassword") - (version "7.2.0") - (source (origin - (method url-fetch) - (uri (crate-uri "rpassword" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "08l3jbjwpsj6awm4lacm2bcj3cn9jhy4j6q21n68k49lmdiwyy36")))) + (name "rust-rtnetlink") + (version "0.14.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "rtnetlink" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "19dbbky7bcrwk4jhgam148s8ykxc7pfrblxjvmciipyq8i9lg15n")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs - (("rust-libc" ,rust-libc-0.2) - ("rust-rtoolbox" ,rust-rtoolbox-0.0.1) - ("rust-winapi" ,rust-winapi-0.3)))) - (home-page "https://github.com/conradkleinespel/rpassword") - (synopsis "Read passwords in Rust console applications") - (description "This package provides a crate for reading passwords in -console applications.") - (license license:asl2.0))) + `(#:cargo-test-flags '("--release" "--" + "--skip=link::test::create_get_delete_macvlan" + "--skip=link::test::create_get_delete_wg" + "--skip=traffic_control::add_filter::test::test_new_filter" + "--skip=traffic_control::add_qdisc::test::test_new_qdisc") + #:cargo-inputs (("rust-async-global-executor" ,rust-async-global-executor-2) + ("rust-futures" ,rust-futures-0.3) + ("rust-log" ,rust-log-0.4) + ("rust-netlink-packet-core" ,rust-netlink-packet-core-0.7) + ("rust-netlink-packet-route" ,rust-netlink-packet-route-0.19) + ("rust-netlink-packet-utils" ,rust-netlink-packet-utils-0.5) + ("rust-netlink-proto" ,rust-netlink-proto-0.11) + ("rust-netlink-sys" ,rust-netlink-sys-0.8) + ("rust-nix" ,rust-nix-0.27) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-tokio" ,rust-tokio-1)) + #:cargo-development-inputs (("rust-async-std" ,rust-async-std-1) + ("rust-env-logger" ,rust-env-logger-0.10) + ("rust-ipnetwork" ,rust-ipnetwork-0.18) + ("rust-macaddr" ,rust-macaddr-1) + ("rust-tokio" ,rust-tokio-1)))) + (home-page "https://github.com/rust-netlink/rtnetlink") + (synopsis "Manipulate linux networking resources via netlink") + (description "This crate provides methods to manipulate networking +resources (links, addresses, arp tables, route tables) via the netlink route +protocol.") + (license license:expat))) -(define-public rust-rpassword-6 +(define-public rust-rtoolbox-0.0.1 (package - (inherit rust-rpassword-7) - (name "rust-rpassword") - (version "6.0.1") + (name "rust-rtoolbox") + (version "0.0.1") (source (origin (method url-fetch) - (uri (crate-uri "rpassword" version)) + (uri (crate-uri "rtoolbox" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0mnrpxvai78mn9wqkqx8wp1gd280jjhn29ixd1dm84l6i2hrkw1b")))) + "0jjjngwn1fa39kschc8zb4hynp4b0jdind7z225cph7m2k2j4kh3")))) + (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2) ("rust-serde" ,rust-serde-1) ("rust-serde-json" ,rust-serde-json-1) - ("rust-winapi" ,rust-winapi-0.3)))))) - -(define-public rust-rpassword-5 - (package - (inherit rust-rpassword-6) - (name "rust-rpassword") - (version "5.0.1") - (source - (origin - (method url-fetch) - (uri (crate-uri "rpassword" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 "1yry1kmgjcb4qd5wak91203493x42ak3dz9hy1c0r9kyib7kdjgz")))) - (arguments - `(#:cargo-inputs - (("rust-libc" ,rust-libc-0.2) - ("rust-winapi" ,rust-winapi-0.3)))))) + ("rust-winapi" ,rust-winapi-0.3)))) + (home-page "") + (synopsis "Utility functions for other crates") + (description + "This package provides utility functions for other crates with no +backwards compatibility guarantees.") + (license license:asl2.0))) -(define-public rust-rpds-1 +(define-public rust-rug-1 (package - (name "rust-rpds") - (version "1.1.0") + (name "rust-rug") + (version "1.18.0") (source - (origin - (method url-fetch) - (uri (crate-uri "rpds" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 "194hjbsicmgqi3dyllqrz09mmhh597m2j9l49lr16cyfscambqd0")))) + (origin + (method url-fetch) + (uri (crate-uri "rug" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1f81id6y3vljys0nvl9mimhm0kh8z0vxnrh2ki1x2838mddklcam")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs (("rust-archery" ,rust-archery-1) - ("rust-serde" ,rust-serde-1)) + `(#:cargo-test-flags + '("--release" "--lib" "--bins" "--tests") + #:cargo-inputs + (("rust-az" ,rust-az-1) + ("rust-gmp-mpfr-sys" ,rust-gmp-mpfr-sys-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-num-integer" ,rust-num-integer-0.1) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-serde" ,rust-serde-1)) #:cargo-development-inputs (("rust-bincode" ,rust-bincode-1) - ("rust-criterion" ,rust-criterion-0.5) - ("rust-pretty-assertions" ,rust-pretty-assertions-1) - ("rust-rand" ,rust-rand-0.8) - ("rust-static-assertions" ,rust-static-assertions-1)))) - (home-page "https://github.com/orium/rpds") - (synopsis "Persistent data structures with structural sharing") - (description "This package provides support for fully persistent data -structures with structural sharing.") - (license license:mpl2.0))) + ("rust-byteorder" ,rust-byteorder-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-serde-test" ,rust-serde-test-1)))) + (inputs + (list gmp mpc mpfr)) + (home-page "https://gitlab.com/tspiteri/rug") + (synopsis + "Arbitrary-precision integers, rational, floating-point and complex numbers") + (description "This is a Rust library of arbitrary-precision integers, rational, +floating-point, and complex numbers based on GMP, MPFR and MPC.") + (license license:lgpl3+))) (define-public rust-run-script-0.10 (package @@ -56554,8 +64240,84 @@ please consider using @code{async-std} or @code{tokio}.") (description "This package provides a Tokio-based asynchronous runtime.") (license (list license:expat license:asl2.0)))) +(define-public rust-rusqlite-0.31 + (package + (name "rust-rusqlite") + (version "0.31.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "rusqlite" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1bic69apqidimqf8gm80b98a832qzl9x6ns8myzah4yjg2ifnf5q")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-bitflags" ,rust-bitflags-2) + ("rust-chrono" ,rust-chrono-0.4) + ("rust-csv" ,rust-csv-1) + ("rust-fallible-iterator" ,rust-fallible-iterator-0.3) + ("rust-fallible-streaming-iterator" ,rust-fallible-streaming-iterator-0.1) + ("rust-hashlink" ,rust-hashlink-0.9) + ("rust-libsqlite3-sys" ,rust-libsqlite3-sys-0.28) + ("rust-rusqlite-macros" ,rust-rusqlite-macros-0.2) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-smallvec" ,rust-smallvec-1) + ("rust-time" ,rust-time-0.3) + ("rust-url" ,rust-url-2) + ("rust-uuid" ,rust-uuid-1)) + #:cargo-development-inputs (("rust-bencher" ,rust-bencher-0.1) + ("rust-doc-comment" ,rust-doc-comment-0.3) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-regex" ,rust-regex-1) + ("rust-tempfile" ,rust-tempfile-3) + ("rust-unicase" ,rust-unicase-2) + ("rust-uuid" ,rust-uuid-1)))) + (inputs (list sqlite)) + (home-page "https://github.com/rusqlite/rusqlite") + (synopsis "Wrapper for SQLite") + (description "This crate provides a wrapper for SQLite.") + (license license:expat))) + +(define-public rust-rusqlite-0.30 + (package + (inherit rust-rusqlite-0.31) + (name "rust-rusqlite") + (version "0.30.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "rusqlite" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0kgjk7h53wp8k2di2j83ivf50f0bk6rg7bq8j36ygxb42lb4d057")))) + (arguments + `(#:cargo-inputs + (("rust-bitflags" ,rust-bitflags-2) + ("rust-chrono" ,rust-chrono-0.4) + ("rust-csv" ,rust-csv-1) + ("rust-fallible-iterator" ,rust-fallible-iterator-0.3) + ("rust-fallible-streaming-iterator" ,rust-fallible-streaming-iterator-0.1) + ("rust-hashlink" ,rust-hashlink-0.8) + ("rust-libsqlite3-sys" ,rust-libsqlite3-sys-0.27) + ("rust-rusqlite-macros" ,rust-rusqlite-macros-0.1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-smallvec" ,rust-smallvec-1) + ("rust-time" ,rust-time-0.3) + ("rust-url" ,rust-url-2) + ("rust-uuid" ,rust-uuid-1)) + #:cargo-development-inputs (("rust-bencher" ,rust-bencher-0.1) + ("rust-doc-comment" ,rust-doc-comment-0.3) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-regex" ,rust-regex-1) + ("rust-tempfile" ,rust-tempfile-3) + ("rust-unicase" ,rust-unicase-2) + ("rust-uuid" ,rust-uuid-1)))))) + (define-public rust-rusqlite-0.29 (package + (inherit rust-rusqlite-0.30) (name "rust-rusqlite") (version "0.29.0") (source (origin @@ -56565,7 +64327,6 @@ please consider using @code{async-std} or @code{tokio}.") (sha256 (base32 "1wj12rmwa8g0bfhsk307fl84k0xcw8ji872xx3k447apdl1rv6sl")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-2) @@ -56587,12 +64348,7 @@ please consider using @code{async-std} or @code{tokio}.") ("rust-regex" ,rust-regex-1) ("rust-tempfile" ,rust-tempfile-3) ("rust-unicase" ,rust-unicase-2) - ("rust-uuid" ,rust-uuid-1)))) - (inputs (list sqlite)) - (home-page "https://github.com/rusqlite/rusqlite") - (synopsis "Wrapper for SQLite") - (description "This crate provides a wrapper for SQLite.") - (license license:expat))) + ("rust-uuid" ,rust-uuid-1)))))) (define-public rust-rusqlite-0.26 (package @@ -56626,6 +64382,44 @@ please consider using @code{async-std} or @code{tokio}.") ("rust-url" ,rust-url-2) ("rust-uuid" ,rust-uuid-0.8)))))) +(define-public rust-rusqlite-macros-0.2 + (package + (name "rust-rusqlite-macros") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "rusqlite-macros" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "07y5887q4via4k7hdfxh61nmcwwz8r0bqlgxrk1p177lrkgz8cdp")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-fallible-iterator" ,rust-fallible-iterator-0.3) + ("rust-litrs" ,rust-litrs-0.4) + ("rust-sqlite3-parser" ,rust-sqlite3-parser-0.12)))) + (home-page "https://github.com/rusqlite/rusqlite") + (synopsis "Private implementation detail of rusqlite crate") + (description "This package provides a private implementation detail of the +@code{rusqlite} crate.") + (license license:expat))) + +(define-public rust-rusqlite-macros-0.1 + (package + (inherit rust-rusqlite-macros-0.2) + (name "rust-rusqlite-macros") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "rusqlite-macros" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0bbgnp7pgk358js63666ix6a9p4fr4lgigaaf4av3aj45qksi4ix")))) + (arguments + `(#:cargo-inputs (("rust-fallible-iterator" ,rust-fallible-iterator-0.3) + ("rust-sqlite3-parser" ,rust-sqlite3-parser-0.12)))))) + (define-public rust-rust-htslib-0.38 (package (name "rust-rust-htslib") @@ -56707,39 +64501,49 @@ reading and writing BAM files.") (define-public rust-rust-decimal-1 (package (name "rust-rust-decimal") - (version "1.17.0") + (version "1.35.0") (source (origin (method url-fetch) (uri (crate-uri "rust_decimal" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1s3k05vpq9ba8mj1wx1fj52kdbq1n8y88zvkrbf0wh0zdbwpadrm")))) + "0ymlnlykg2k9cxxs6wcy41sz6xij6cbazq70k49j30faq32d340p")))) (build-system cargo-build-system) (arguments `(#:tests? #f ; not all test files included. #:cargo-inputs (("rust-arbitrary" ,rust-arbitrary-1) - ("rust-arrayvec" ,rust-arrayvec-0.5) - ("rust-byteorder" ,rust-byteorder-1) + ("rust-arrayvec" ,rust-arrayvec-0.7) + ("rust-borsh" ,rust-borsh-1) ("rust-bytes" ,rust-bytes-1) ("rust-diesel" ,rust-diesel-1) + ("rust-diesel" ,rust-diesel-2) + ("rust-ndarray" ,rust-ndarray-0.15) ("rust-num-traits" ,rust-num-traits-0.2) - ("rust-postgres" ,rust-postgres-0.19) + ("rust-postgres-types" ,rust-postgres-types-0.2) + ("rust-proptest" ,rust-proptest-1) + ("rust-rand" ,rust-rand-0.8) + ("rust-rkyv" ,rust-rkyv-0.7) + ("rust-rocket" ,rust-rocket-0.5) ("rust-serde" ,rust-serde-1) ("rust-serde-json" ,rust-serde-json-1) ("rust-tokio-postgres" ,rust-tokio-postgres-0.7)) #:cargo-development-inputs (("rust-bincode" ,rust-bincode-1) ("rust-bytes" ,rust-bytes-1) - ("rust-criterion" ,rust-criterion-0.3) + ("rust-criterion" ,rust-criterion-0.5) ("rust-csv" ,rust-csv-1) ("rust-futures" ,rust-futures-0.3) - ("rust-serde-derive" ,rust-serde-derive-1) + ("rust-postgres" ,rust-postgres-0.19) + ("rust-rand" ,rust-rand-0.8) + ("rust-rust-decimal-macros" ,rust-rust-decimal-macros-1) + ("rust-serde" ,rust-serde-1) ("rust-serde-json" ,rust-serde-json-1) - ("rust-tokio" ,rust-tokio-1)))) + ("rust-tokio" ,rust-tokio-1) + ("rust-tokio-postgres" ,rust-tokio-postgres-0.7) + ("rust-version-sync" ,rust-version-sync-0.9)))) (home-page "https://github.com/paupino/rust-decimal") (synopsis "Decimal implementation suitable for financial calculations") (description @@ -56747,8 +64551,69 @@ reading and writing BAM files.") suitable for financial calculations.") (license license:expat))) +(define-public rust-rust-decimal-macros-1 + (package + (name "rust-rust-decimal-macros") + (version "1.34.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "rust_decimal_macros" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "10kdmfm95z9yx3ypk3kfqjbvnr5dhfsg4md6wyayz6vji0ap0674")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-quote" ,rust-quote-1) + ("rust-rust-decimal" ,rust-rust-decimal-1)) + #:cargo-development-inputs (("rust-trybuild" ,rust-trybuild-1)))) + (home-page "https://github.com/paupino/rust-decimal") + (synopsis "Shorthand macros to assist creating Decimal types") + (description "Shorthand macros to assist creating Decimal types.") + (license license:expat))) + +(define-public rust-rust-embed-8 + (package + (name "rust-rust-embed") + (version "8.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "rust-embed" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0ic70vd4lh6dhjnxaq8wywq3bg23jf78jyyashb3s1b601nz8y7v")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-test-flags '("--release" "--" + "--skip=create_is_accurate" + "--skip=last_modified_is_accurate" + "--skip=RustEmbed") + #:cargo-inputs (("rust-actix-web" ,rust-actix-web-4) + ("rust-axum" ,rust-axum-0.7) + ("rust-hex" ,rust-hex-0.4) + ("rust-include-flate" ,rust-include-flate-0.2) + ("rust-mime-guess" ,rust-mime-guess-2) + ("rust-poem" ,rust-poem-1) + ("rust-rocket" ,rust-rocket-0.5) + ("rust-rust-embed-impl" ,rust-rust-embed-impl-8) + ("rust-rust-embed-utils" ,rust-rust-embed-utils-8) + ("rust-salvo" ,rust-salvo-0.16) + ("rust-tokio" ,rust-tokio-1) + ("rust-walkdir" ,rust-walkdir-2) + ("rust-warp" ,rust-warp-0.3)) + #:cargo-development-inputs (("rust-sha2" ,rust-sha2-0.10)))) + (home-page "https://github.com/pyrossh/rust-embed") + (synopsis "Rust custom @code{Derive} macro") + (description + "This package provides a custom @code{Derive} macro which loads files +into the Rust binary at compile time during release and loads the file from +the file-system during development.") + (license license:expat))) + (define-public rust-rust-embed-5 (package + (inherit rust-rust-embed-8) (name "rust-rust-embed") (version "5.9.0") (source @@ -56758,9 +64623,10 @@ suitable for financial calculations.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "08smnqn21vn5zaywfki391v2l9v30cs0446qzzhvjssxmimgxq9g")))) - (build-system cargo-build-system) (arguments - `(#:skip-build? #t + `(#:cargo-test-flags + '("--release" "--" + "--skip=RustEmbed") #:cargo-inputs (("rust-actix-web" ,rust-actix-web-3) ("rust-include-flate" ,rust-include-flate-0.1) @@ -56770,8 +64636,28 @@ suitable for financial calculations.") ("rust-rust-embed-utils" ,rust-rust-embed-utils-5) ("rust-tokio" ,rust-tokio-0.2) ("rust-walkdir" ,rust-walkdir-2) - ("rust-warp" ,rust-warp-0.2)))) - (home-page "https://github.com/pyros2097/rust-embed") + ("rust-warp" ,rust-warp-0.2)))))) + +(define-public rust-rust-embed-impl-8 + (package + (name "rust-rust-embed-impl") + (version "8.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "rust-embed-impl" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1j2gqh8dl6c26y9iicjfgj9r5in3fw8k52fxnczhlln0qsiw46mr")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-rust-embed-utils" ,rust-rust-embed-utils-8) + ("rust-shellexpand" ,rust-shellexpand-3) + ("rust-syn" ,rust-syn-2) + ("rust-walkdir" ,rust-walkdir-2)))) + (home-page "https://github.com/pyrossh/rust-embed") (synopsis "Rust custom @code{Derive} macro") (description "This package provides a custom @code{Derive} macro which loads files @@ -56781,6 +64667,7 @@ the file-system during development.") (define-public rust-rust-embed-impl-5 (package + (inherit rust-rust-embed-impl-8) (name "rust-rust-embed-impl") (version "5.9.0") (source @@ -56790,45 +64677,52 @@ the file-system during development.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "0rlykmykrpllkf4900wv2jfdmq3m5qqrqhw4fdlbzxrfqi0irn9y")))) - (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-rust-embed-utils" ,rust-rust-embed-utils-5) ("rust-shellexpand" ,rust-shellexpand-2) ("rust-syn" ,rust-syn-1) - ("rust-walkdir" ,rust-walkdir-2)))) - (home-page "https://github.com/pyros2097/rust-embed") - (synopsis "Rust custom @code{Derive} macro") - (description - "This package provides a custom @code{Derive} macro which loads files -into the Rust binary at compile time during release and loads the file from -the file-system during development.") - (license license:expat))) + ("rust-walkdir" ,rust-walkdir-2)))))) -(define-public rust-rust-embed-utils-5 +(define-public rust-rust-embed-utils-8 (package (name "rust-rust-embed-utils") - (version "5.1.0") + (version "8.3.0") (source (origin (method url-fetch) (uri (crate-uri "rust-embed-utils" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0vc7492a6qlq7r899p7vyx5cwiqwkw2pf85mfw5anwr42ccj4l9a")))) + (base32 "10am6j29b5p7na45cz6vqxkg8gy47xbir95d9vzzyrr50f4r1xl6")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-walkdir" ,rust-walkdir-2)))) - (home-page "https://github.com/pyros2097/rust-embed") + `(#:cargo-inputs (("rust-globset" ,rust-globset-0.4) + ("rust-mime-guess" ,rust-mime-guess-2) + ("rust-sha2" ,rust-sha2-0.10) + ("rust-walkdir" ,rust-walkdir-2)))) + (home-page "https://github.com/pyrossh/rust-embed") (synopsis "Utilities for @code{rust-embed}") (description "This package provides utilities for @code{rust-embed}.") (license license:expat))) +(define-public rust-rust-embed-utils-5 + (package + (inherit rust-rust-embed-utils-8) + (name "rust-rust-embed-utils") + (version "5.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "rust-embed-utils" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0vc7492a6qlq7r899p7vyx5cwiqwkw2pf85mfw5anwr42ccj4l9a")))) + (arguments + `(#:cargo-inputs (("rust-walkdir" ,rust-walkdir-2)))))) + (define-public rust-eml-parser-0.1 (package (name "rust-eml-parser") @@ -56926,6 +64820,23 @@ the file-system during development.") based protocols (@code{EthernetII}, IPv4, IPv6, UDP, TCP ...).") (license (list license:expat license:asl2.0)))) +(define-public rust-etherparse-0.9 + (package + (inherit rust-etherparse-0.13) + (name "rust-etherparse") + (version "0.9.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "etherparse" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "01s86nj0k663mgxpj3r7y5wr50l5c3aq0pm4rpzyb7hz50i0k8ig")))) + (arguments + `(#:cargo-inputs (("rust-byteorder" ,rust-byteorder-1)) + #:cargo-development-inputs (("rust-assert-matches" ,rust-assert-matches-1) + ("rust-proptest" ,rust-proptest-0.9)))))) + (define-public rust-rust-hawktracer-0.7 (package (name "rust-rust-hawktracer") @@ -57048,23 +64959,22 @@ based protocols (@code{EthernetII}, IPv4, IPv6, UDP, TCP ...).") "This package provides a sys crate for the rust_hawktracer library.") (license (list license:expat license:asl2.0)))) -(define-public rust-rust-ini-0.17 +(define-public rust-rust-ini-0.18 (package (name "rust-rust-ini") - (version "0.17.0") + (version "0.18.0") (source (origin (method url-fetch) (uri (crate-uri "rust-ini" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "08hfh6p2svznza3m07vavsc4c8x4g6d715sz58rzh73sm551qiv3")))) + (base32 "1px22l3m84v7f46pa3p4bsjykivw8ryq6af8kpkzdd16c11z5mgn")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-1) - ("rust-ordered-multimap" ,rust-ordered-multimap-0.3) + ("rust-ordered-multimap" ,rust-ordered-multimap-0.4) ("rust-unicase" ,rust-unicase-2)))) (home-page "https://github.com/zonyitoo/rust-ini") (synopsis "INI configuration file parsing library in Rust") @@ -57072,6 +64982,25 @@ based protocols (@code{EthernetII}, IPv4, IPv6, UDP, TCP ...).") "This package is an INI configuration file parsing library in Rust.") (license license:expat))) +(define-public rust-rust-ini-0.17 + (package + (inherit rust-rust-ini-0.18) + (name "rust-rust-ini") + (version "0.17.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "rust-ini" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "08hfh6p2svznza3m07vavsc4c8x4g6d715sz58rzh73sm551qiv3")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-cfg-if" ,rust-cfg-if-1) + ("rust-ordered-multimap" ,rust-ordered-multimap-0.3) + ("rust-unicase" ,rust-unicase-2)))))) + (define-public rust-rust-ini-0.13 (package (inherit rust-rust-ini-0.17) @@ -57143,7 +65072,7 @@ It is automatically published using the compiler repository at (define-public rust-rustc-demangle-0.1 (package (name "rust-rustc-demangle") - (version "0.1.16") + (version "0.1.23") (source (origin (method url-fetch) @@ -57151,11 +65080,10 @@ It is automatically published using the compiler repository at (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "10qp42sl1wrdbgbbh8rnay2grm976z7hqgz32c4y09l1c071qsac")))) + "0xnbk2bmyzshacjm2g1kd4zzv2y2az14bw3sjccq5qkpmsfvn9nn")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#: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/alexcrichton/rustc-demangle") @@ -57365,29 +65293,28 @@ forth, as well as the ability to create custom thread-pools with ThreadPool.") (define-public rust-rustc-serialize-0.3 (package (name "rust-rustc-serialize") - (version "0.3.24") + (version "0.3.25") (source - (origin - (method url-fetch) - (uri (crate-uri "rustc-serialize" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "1nkg3vasg7nk80ffkazizgiyv3hb1l9g3d8h17cajbkx538jiwfw")))) + (origin + (method url-fetch) + (uri (crate-uri "rustc-serialize" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "00c494bsxjqjvc15h9x2nkgwl6bjdp9bmb9v0xs4ckv0h33lp0zy")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-rand" ,rust-rand-0.3)))) - (home-page "https://github.com/rust-lang-deprecated/rustc-serialize") + `(#:tests? #f ; could not find `rustc_serialize` in the crate root + #:cargo-development-inputs (("rust-rand" ,rust-rand-0.3)))) + (home-page "https://github.com/rust-lang/rustc-serialize") (synopsis "Generic serialization/deserialization support") (description "This package provides generic serialization/deserialization support corresponding to the @code{derive(RustcEncodable, RustcDecodable)} mode in the compiler. Also includes support for hex, base64, and json encoding and -decoding.") - (license (list license:asl2.0 - license:expat)))) +decoding. + +This crate is deprecated in favor of serde.") + (license (list license:asl2.0 license:expat)))) (define-public rust-rustc-std-workspace-alloc-1 (package @@ -57453,26 +65380,24 @@ rust-lang/rust integration.") (define-public rust-rustc-test-0.3 (package (name "rust-rustc-test") - (version "0.3.0") + (version "0.3.1") (source (origin (method url-fetch) (uri (crate-uri "rustc-test" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "0a27mlcg0ck0hgsdvwk792x9z1k1qq1wj091f1l5yggbdbcsnx5w")))) + (base32 "1fsr9rnlsch5gygxhz0mq3d02vzrrf0jgbwcihhaz0xfn1kpkk5a")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t + `(#:tests? #f ; Name collision with the rust compiler. #:cargo-inputs (("rust-getopts" ,rust-getopts-0.2) ("rust-libc" ,rust-libc-0.2) ("rust-rustc-serialize" ,rust-rustc-serialize-0.3) + ("rust-rustc-version" ,rust-rustc-version-0.2) ("rust-term" ,rust-term-0.4) - ("rust-time" ,rust-time-0.1) - ("rust-rustc-version" ,rust-rustc-version-0.2)))) + ("rust-time" ,rust-time-0.1)))) (home-page "https://github.com/servo/rustc-test") (synopsis "Fork of Rust's test crate") (description @@ -57555,6 +65480,36 @@ rustc compiler.") `(#:cargo-inputs (("rust-semver" ,rust-semver-0.1)))))) +(define-public rust-rustdoc-json-0.8 + (package + (name "rust-rustdoc-json") + (version "0.8.9") + (source + (origin + (method url-fetch) + (uri (crate-uri "rustdoc-json" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "120k214xy255pfvizb6xlks0yv7psgjr3nh6l9xj9bgdfis747m2")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f + #:cargo-inputs (("rust-cargo-manifest" ,rust-cargo-manifest-0.13) + ("rust-cargo-metadata" ,rust-cargo-metadata-0.18) + ("rust-serde" ,rust-serde-1) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-toml" ,rust-toml-0.8)) + #:cargo-development-inputs (("rust-assert-cmd" ,rust-assert-cmd-2) + ("rust-expect-test" ,rust-expect-test-1) + ("rust-predicates" ,rust-predicates-3) + ("rust-public-api" ,rust-public-api-0.33) + ("rust-tempfile" ,rust-tempfile-3)))) + (home-page + "https://github.com/Enselic/cargo-public-api/tree/main/rustdoc-json") + (synopsis "Utilities for working with rustdoc JSON.") + (description "Utilities for working with rustdoc JSON.") + (license license:expat))) + (define-public rust-rustdoc-stripper-0.1 (package (name "rust-rustdoc-stripper") @@ -57577,8 +65532,82 @@ rustc compiler.") "This package provides a tool to manipulate rustdoc comments.") (license license:asl2.0))) +(define-public rust-rustdoc-types-0.23 + (package + (name "rust-rustdoc-types") + (version "0.23.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "rustdoc-types" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "095jdf44p0b02xq0n9vx1qpnrfgdqkd8nsbmp61r0s4x0q4nyr6c")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-serde" ,rust-serde-1)) + #:cargo-development-inputs (("rust-bincode" ,rust-bincode-1) + ("rust-serde-json" ,rust-serde-json-1)))) + (home-page "https://github.com/aDotInTheVoid/rustdoc-types/") + (synopsis "Types for rustdoc's json output") + (description "Types for rustdoc's json output.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-rustfix-0.8 + (package + (name "rust-rustfix") + (version "0.8.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "rustfix" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1975qnw1rdd1bsj8qzii0vx0mdxv4946xp4gfprmvnj6f04lp1l1")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-tracing" ,rust-tracing-0.1)) + #:cargo-development-inputs + (("rust-anyhow" ,rust-anyhow-1) + ("rust-proptest" ,rust-proptest-1) + ("rust-similar" ,rust-similar-2) + ("rust-tempfile" ,rust-tempfile-3) + ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3)))) + (home-page "https://github.com/rust-lang/cargo") + (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.7 + (package + (inherit rust-rustfix-0.8) + (name "rust-rustfix") + (version "0.7.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "rustfix" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0xaicbgcbvwkf4m9wxmd8jic1a1di0k63mjlyd74jbiap6z0rhby")))) + (arguments + `(#:cargo-inputs (("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-tracing" ,rust-tracing-0.1)) + #:cargo-development-inputs + (("rust-anyhow" ,rust-anyhow-1) + ("rust-proptest" ,rust-proptest-1) + ("rust-similar" ,rust-similar-2) + ("rust-tempfile" ,rust-tempfile-3) + ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3)))))) + (define-public rust-rustfix-0.6 (package + (inherit rust-rustfix-0.7) (name "rust-rustfix") (version "0.6.1") (source @@ -57588,18 +65617,13 @@ rustc compiler.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "10b4qlvfwljp7yss8afj0lnn8vqj78n93n9vfmkq9616kqyqblpc")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t ; Cut the dependency chain here #:cargo-inputs (("rust-anyhow" ,rust-anyhow-1) ("rust-log" ,rust-log-0.4) ("rust-serde" ,rust-serde-1) - ("rust-serde-json" ,rust-serde-json-1)))) - (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-serde-json" ,rust-serde-json-1)))))) (define-public rust-rustfix-0.5 (package @@ -57650,17 +65674,39 @@ rustc compiler.") `(("rust-failure" ,rust-failure-0.1) ,@(alist-delete "rust-anyhow" cargo-inputs))))))) +(define-public rust-rusticata-macros-4 + (package + (name "rust-rusticata-macros") + (version "4.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "rusticata-macros" version)) + (file-name + (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "03dmfxhgwzpm1360iwcpcg3y18ddgya0i0hc599am212pdvj7ib5")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-nom" ,rust-nom-7)))) + (home-page "https://github.com/rusticata/rusticata-macros") + (synopsis "Helper macros for Rusticata") + (description "Helper macros for Rusticata.") + (license (list license:expat license:asl2.0)))) + (define-public rust-rustix-0.38 (package (name "rust-rustix") - (version "0.38.28") + (version "0.38.31") (source (origin (method url-fetch) (uri (crate-uri "rustix" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "05m3vacvbqbg6r6ksmx9k5afpi0lppjdv712crrpsrfax2jp5rbj")) + (base32 "0jg9yj3i6qnzk1y82hng7rb1bwhslfbh57507dxcs9mgcakf38vf")) (snippet #~(begin (use-modules (guix build utils)) (for-each delete-file (find-files "." "\\.a$")) @@ -57943,6 +65989,30 @@ font rendering.") ("rust-lazy-static" ,rust-lazy-static-1) ("rust-unicode-normalization" ,rust-unicode-normalization-0.1)))))) +(define-public rust-rustup-toolchain-0.1 + (package + (name "rust-rustup-toolchain") + (version "0.1.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "rustup-toolchain" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "15fcw826mrgml07qw1h0ylgqvhj3wr7ggry2dwr9q63z8rh6yh34")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f + #:cargo-inputs (("rust-thiserror" ,rust-thiserror-1)) + #:cargo-development-inputs (("rust-expect-test" ,rust-expect-test-1) + ("rust-public-api" ,rust-public-api-0.32) + ("rust-rustdoc-json" ,rust-rustdoc-json-0.8)))) + (home-page + "https://github.com/Enselic/cargo-public-api/tree/main/rustup-toolchain") + (synopsis "Utilities for rustup toolchain") + (description "Utilities for working with rustup toolchains.") + (license license:expat))) + (define-public rust-rustversion-1 (package (name "rust-rustversion") @@ -58035,8 +66105,55 @@ sub-processes using a fork-like interface.") ("rust-tempfile" ,rust-tempfile-3) ("rust-wait-timeout" ,rust-wait-timeout-0.2)))))) +(define-public rust-rustyline-13 + (package + (name "rust-rustyline") + (version "13.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "rustyline" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "11mywskk2jcxhanlsgzza5yx6ywpdlzr64qhbgpsx45clj1xd8h2")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-test-flags '("--release" "--" + "--skip=binding::test::size_of_event") + #:cargo-inputs (("rust-bitflags" ,rust-bitflags-2) + ("rust-cfg-if" ,rust-cfg-if-1) + ("rust-clipboard-win" ,rust-clipboard-win-5) + ("rust-fd-lock" ,rust-fd-lock-4) + ("rust-home" ,rust-home-0.5) + ("rust-libc" ,rust-libc-0.2) + ("rust-log" ,rust-log-0.4) + ("rust-memchr" ,rust-memchr-2) + ("rust-nix" ,rust-nix-0.27) + ("rust-radix-trie" ,rust-radix-trie-0.2) + ("rust-regex" ,rust-regex-1) + ("rust-rusqlite" ,rust-rusqlite-0.30) + ("rust-rustyline-derive" ,rust-rustyline-derive-0.10) + ("rust-signal-hook" ,rust-signal-hook-0.3) + ("rust-skim" ,rust-skim-0.10) + ("rust-termios" ,rust-termios-0.3) + ("rust-unicode-segmentation" ,rust-unicode-segmentation-1) + ("rust-unicode-width" ,rust-unicode-width-0.1) + ("rust-utf8parse" ,rust-utf8parse-0.2) + ("rust-winapi" ,rust-winapi-0.3)) + #:cargo-development-inputs (("rust-assert-matches" ,rust-assert-matches-1) + ("rust-doc-comment" ,rust-doc-comment-0.3) + ("rust-env-logger" ,rust-env-logger-0.10) + ("rust-rand" ,rust-rand-0.8) + ("rust-tempfile" ,rust-tempfile-3)))) + (home-page "https://github.com/kkawakam/rustyline") + (synopsis "Readline implementation in Rust") + (description + "Rustyline is a readline implementation based on the linenoise package.") + (license license:expat))) + (define-public rust-rustyline-12 (package + (inherit rust-rustyline-13) (name "rust-rustyline") (version "12.0.0") (source @@ -58046,7 +66163,6 @@ sub-processes using a fork-like interface.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "1fcxgkz6hia74wnwnf1b92s69gnij5xgr42xw637xj05r95wlklr")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-2) ("rust-cfg-if" ,rust-cfg-if-1) @@ -58072,12 +66188,7 @@ sub-processes using a fork-like interface.") ("rust-doc-comment" ,rust-doc-comment-0.3) ("rust-env-logger" ,rust-env-logger-0.10) ("rust-rand" ,rust-rand-0.8) - ("rust-tempfile" ,rust-tempfile-3)))) - (home-page "https://github.com/kkawakam/rustyline") - (synopsis "Readline implementation in Rust") - (description - "Rustyline is a readline implementation based on the linenoise package.") - (license license:expat))) + ("rust-tempfile" ,rust-tempfile-3)))))) (define-public rust-rustyline-10 (package @@ -58250,17 +66361,17 @@ sub-processes using a fork-like interface.") ("rust-rustyline-derive" ,rust-rustyline-derive-0.3) ("rust-tempfile" ,rust-tempfile-3)))))) -(define-public rust-rustyline-derive-0.9 +(define-public rust-rustyline-derive-0.10 (package (name "rust-rustyline-derive") - (version "0.9.0") + (version "0.10.0") (source (origin (method url-fetch) (uri (crate-uri "rustyline-derive" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0hvaj1n0k7ys8iqfxvymmakv9aqqpvm53hagw55jw7954xaaycjs")))) + (base32 "0lfr25qdrn0awccq999d6g8m7bhsyxbkliibdpzimbzniff9bbz5")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) @@ -58271,6 +66382,23 @@ sub-processes using a fork-like interface.") (description "This package provides Rustyline macros implementation in Rust.") (license license:expat))) +(define-public rust-rustyline-derive-0.9 + (package + (inherit rust-rustyline-derive-0.10) + (name "rust-rustyline-derive") + (version "0.9.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "rustyline-derive" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0hvaj1n0k7ys8iqfxvymmakv9aqqpvm53hagw55jw7954xaaycjs")))) + (arguments + `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-2)))))) + (define-public rust-rustyline-derive-0.7 (package (inherit rust-rustyline-derive-0.9) @@ -58305,17 +66433,17 @@ sub-processes using a fork-like interface.") (("rust-quote" ,rust-quote-1) ("rust-syn" ,rust-syn-1)))))) -(define-public rust-ruzstd-0.4 +(define-public rust-ruzstd-0.5 (package (name "rust-ruzstd") - (version "0.4.0") + (version "0.5.0") (source (origin (method url-fetch) (uri (crate-uri "ruzstd" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1p4ghqzkq36dy1x1ijnk7jmml4wi3v9bkfzlbm2hsnkiz6wglgxc")))) + (base32 "0ga8jciw7ka3mxrzl39skmsbdslajghzglcil10g0z4rh65fpi2q")))) (build-system cargo-build-system) (arguments `(#:cargo-test-flags @@ -58331,7 +66459,7 @@ sub-processes using a fork-like interface.") "--skip=tests::test_specific_file" "--skip=tests::test_streaming") #:cargo-inputs (("rust-byteorder" ,rust-byteorder-1) - ("rust-thiserror-core" ,rust-thiserror-core-1) + ("rust-derive-more" ,rust-derive-more-0.99) ("rust-twox-hash" ,rust-twox-hash-1)) #:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.3) ("rust-rand" ,rust-rand-0.8)))) @@ -58341,6 +66469,37 @@ sub-processes using a fork-like interface.") "This package provides a decoder for the zstd compression format.") (license license:expat))) +(define-public rust-ruzstd-0.4 + (package + (inherit rust-ruzstd-0.5) + (name "rust-ruzstd") + (version "0.4.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "ruzstd" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1p4ghqzkq36dy1x1ijnk7jmml4wi3v9bkfzlbm2hsnkiz6wglgxc")))) + (arguments + `(#:cargo-test-flags + '("--release" "--" + ;; not all files included + "--skip=tests::decode_corpus::test_decode_corpus_files" + "--skip=tests::dict_test::test_dict_decoding" + "--skip=tests::fuzz_regressions::test_all_artifacts" + "--skip=tests::test_block_header_reading" + "--skip=tests::test_decode_from_to" + "--skip=tests::test_frame_decoder" + "--skip=tests::test_frame_header_reading" + "--skip=tests::test_specific_file" + "--skip=tests::test_streaming") + #:cargo-inputs (("rust-byteorder" ,rust-byteorder-1) + ("rust-thiserror-core" ,rust-thiserror-core-1) + ("rust-twox-hash" ,rust-twox-hash-1)) + #:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.3) + ("rust-rand" ,rust-rand-0.8)))))) + (define-public rust-rkyv-0.7 (package (name "rust-rkyv") @@ -58582,27 +66741,40 @@ quickly convert floating point numbers to decimal strings.") computation (experimental)") (license (list license:asl2.0 license:expat)))) -(define-public rust-safe-arch-0.6 +(define-public rust-safe-arch-0.7 (package (name "rust-safe-arch") - (version "0.6.0") + (version "0.7.1") (source (origin (method url-fetch) (uri (crate-uri "safe_arch" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0ad5ykwgq9ll1ymp83d9cayzj8q191rik71ga5wzkndhrkj22j3r")))) + (base32 "0m63dasp3rs9mkaa5wai6l6v14lbb788igaidys7k8g6w5f0g67k")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs - (("rust-bytemuck" ,rust-bytemuck-1)))) + `(#:cargo-inputs (("rust-bytemuck" ,rust-bytemuck-1)))) (home-page "https://github.com/Lokathor/safe_arch") (synopsis "Access core::arch safely") (description "This package exposes @code{core::arch} safely via @code{#[cfg()]}.") (license (list license:zlib license:asl2.0 license:expat)))) +(define-public rust-safe-arch-0.6 + (package + (inherit rust-safe-arch-0.7) + (name "rust-safe-arch") + (version "0.6.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "safe_arch" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0ad5ykwgq9ll1ymp83d9cayzj8q191rik71ga5wzkndhrkj22j3r")))) + (arguments + `(#:cargo-inputs (("rust-bytemuck" ,rust-bytemuck-1)))))) (define-public rust-safe-arch-0.5 (package @@ -58690,6 +66862,187 @@ paths point to the same file.") #:cargo-development-inputs (("rust-rand" ,rust-rand-0.3)))))) +(define-public rust-sample-arrow2-0.17 + (package + (name "rust-sample-arrow2") + (version "0.17.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "sample-arrow2" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0xw9mdhzb0wx26b4bq1d94ib179lmzc5kfsrhgp5gk75g84k0ash")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-arrow2" ,rust-arrow2-0.17) + ("rust-sample-std" ,rust-sample-std-0.2)) + #:cargo-development-inputs (("rust-lazy-static" ,rust-lazy-static-1) + ("rust-quickcheck" ,rust-quickcheck-1) + ("rust-sample-test" ,rust-sample-test-0.2)))) + (home-page "https://docs.rs/sample-arrow2") + (synopsis "Samplers for arrow2 for use with sample-test") + (description "Samplers for arrow2 for use with sample-test.") + (license license:asl2.0))) + +(define-public rust-sample-arrow2-0.1 + (package + (inherit rust-sample-arrow2-0.17) + (name "rust-sample-arrow2") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "sample-arrow2" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1b0pqyxsv6qjg16xsj8isx5maj6cdmy12rg31b7gc14cg4npqmav")))) + (arguments + `(#:cargo-inputs (("rust-arrow2" ,rust-arrow2-0.17) + ("rust-sample-std" ,rust-sample-std-0.1)) + #:cargo-development-inputs (("rust-lazy-static" ,rust-lazy-static-1) + ("rust-quickcheck" ,rust-quickcheck-1) + ("rust-sample-test" ,rust-sample-test-0.1)))))) + +(define-public rust-sample-std-0.2 + (package + (name "rust-sample-std") + (version "0.2.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "sample-std" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1j2q8flzjjcbfnqkj08fyqa2dwdwigxaxn04w2hjqazbqqcx52wl")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; Errors in the test code. + #:cargo-inputs (("rust-casey" ,rust-casey-0.4) + ("rust-quickcheck" ,rust-quickcheck-1) + ("rust-rand" ,rust-rand-0.8) + ("rust-rand-regex" ,rust-rand-regex-0.15) + ("rust-regex" ,rust-regex-1)) + #:cargo-development-inputs (("rust-once-cell" ,rust-once-cell-1) + ("rust-sample-test" ,rust-sample-test-0.2)))) + (home-page "https://docs.rs/sample-std") + (synopsis "Sampler definitions and implementations for st") + (description "Sampler definitions and implementations for st.") + (license license:asl2.0))) + +(define-public rust-sample-std-0.1 + (package + (inherit rust-sample-std-0.2) + (name "rust-sample-std") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "sample-std" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1j2p3bj3c8gcxrfx5402zygm5l564p09bc0gj8wfhb1hqcyiayjn")))) + (arguments + `(#:tests? #f ; Errors in the test code. + #:cargo-inputs (("rust-casey" ,rust-casey-0.4) + ("rust-quickcheck" ,rust-quickcheck-1) + ("rust-rand" ,rust-rand-0.8) + ("rust-rand-regex" ,rust-rand-regex-0.15) + ("rust-regex" ,rust-regex-1)) + #:cargo-development-inputs (("rust-once-cell" ,rust-once-cell-1) + ("rust-sample-test" ,rust-sample-test-0.1)))))) + +(define-public rust-sample-test-0.2 + (package + (name "rust-sample-test") + (version "0.2.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "sample-test" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1gymqxvr6avi40g73mg56lgzbs2x4yvy50mm15mpa5k4a7557cp8")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-env-logger" ,rust-env-logger-0.10) + ("rust-log" ,rust-log-0.4) + ("rust-quickcheck" ,rust-quickcheck-1) + ("rust-sample-std" ,rust-sample-std-0.2) + ("rust-sample-test-macros" ,rust-sample-test-macros-0.2)) + #:cargo-development-inputs (("rust-once-cell" ,rust-once-cell-1)))) + (home-page "https://docs.rs/sample-test") + (synopsis "Sampling strategies and machinery for testing arbitrary data") + (description + "Sampling strategies and machinery for testing arbitrary data") + (license license:asl2.0))) + +(define-public rust-sample-test-0.1 + (package + (inherit rust-sample-test-0.2) + (name "rust-sample-test") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "sample-test" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1cli62gcy91d4n97visnqqpbpws5xwrzlnl0w8dgq6gz8w4m0gki")))) + (arguments + `(#:cargo-inputs (("rust-env-logger" ,rust-env-logger-0.10) + ("rust-log" ,rust-log-0.4) + ("rust-quickcheck" ,rust-quickcheck-1) + ("rust-sample-std" ,rust-sample-std-0.1) + ("rust-sample-test-macros" ,rust-sample-test-macros-0.1)) + #:cargo-development-inputs (("rust-once-cell" ,rust-once-cell-1)))))) + +(define-public rust-sample-test-macros-0.2 + (package + (name "rust-sample-test-macros") + (version "0.2.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "sample-test-macros" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1vxmx4i0hcnbbaky4d7xpzw2ckff00bkkdmdzn0lbfw9fnd47ijw")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-sample-std" ,rust-sample-std-0.2) + ("rust-syn" ,rust-syn-1)) + #:cargo-development-inputs (("rust-lazy-static" ,rust-lazy-static-1) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-sample-test" ,rust-sample-test-0.2)))) + (home-page "https://docs.rs/sample-test-macros") + (synopsis "Proc-macros used by sample-test") + (description "Proc-macros used by sample-test.") + (license license:asl2.0))) + +(define-public rust-sample-test-macros-0.1 + (package + (inherit rust-sample-test-macros-0.2) + (name "rust-sample-test-macros") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "sample-test-macros" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0kjkavrzz8zs6jkjya6l73ggy4bi6yma67gdnsasx6i55a1jq6nz")))) + (arguments + `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-sample-std" ,rust-sample-std-0.1) + ("rust-syn" ,rust-syn-1)) + #:cargo-development-inputs (("rust-lazy-static" ,rust-lazy-static-1) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-sample-test" ,rust-sample-test-0.1)))))) + (define-public rust-sanakirja-0.10 (package (name "rust-sanakirja") @@ -58867,18 +67220,20 @@ single-cell matrices.") (define-public rust-schemars-0.8 (package (name "rust-schemars") - (version "0.8.8") + (version "0.8.20") (source (origin (method url-fetch) (uri (crate-uri "schemars" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1qvhq1yixygd8ihc0qxmnhw4x08fa44q88v088gvc6pa1k4a7df6")))) + (base32 "0aby31lm1jwlj5hlw5lqq7xyzhc6vrmghdjq995f5asbl7p8q8dh")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-arrayvec" ,rust-arrayvec-0.5) + ("rust-arrayvec" ,rust-arrayvec-0.7) + ("rust-bigdecimal" ,rust-bigdecimal-0.4) ("rust-bigdecimal" ,rust-bigdecimal-0.3) ("rust-bytes" ,rust-bytes-1) ("rust-chrono" ,rust-chrono-0.4) @@ -58886,15 +67241,19 @@ single-cell matrices.") ("rust-either" ,rust-either-1) ("rust-enumset" ,rust-enumset-1) ("rust-indexmap" ,rust-indexmap-1) + ("rust-indexmap" ,rust-indexmap-2) ("rust-rust-decimal" ,rust-rust-decimal-1) ("rust-schemars-derive" ,rust-schemars-derive-0.8) + ("rust-semver" ,rust-semver-1) ("rust-serde" ,rust-serde-1) ("rust-serde-json" ,rust-serde-json-1) ("rust-smallvec" ,rust-smallvec-1) + ("rust-smol-str" ,rust-smol-str-0.1) ("rust-url" ,rust-url-2) - ("rust-uuid" ,rust-uuid-0.8)) + ("rust-uuid" ,rust-uuid-0.8) + ("rust-uuid" ,rust-uuid-1)) #:cargo-development-inputs - (("rust-pretty-assertions" ,rust-pretty-assertions-0.6) + (("rust-pretty-assertions" ,rust-pretty-assertions-1) ("rust-trybuild" ,rust-trybuild-1)))) (home-page "https://graham.cool/schemars/") (synopsis "Generate JSON Schemas from Rust code") @@ -58902,32 +67261,80 @@ single-cell matrices.") Rust code.") (license license:expat))) +(define-public rust-schemars-0.6 + (package + (inherit rust-schemars-0.8) + (name "rust-schemars") + (version "0.6.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "schemars" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1v6acgxkbhaw7fzg4mp09jv231f0mr224my629435wxasrrrfmh7")))) + (arguments + `(#:cargo-test-flags '("--release" "--" + "--skip=doc_comments_struct") + #:cargo-inputs (("rust-arrayvec" ,rust-arrayvec-0.5) + ("rust-chrono" ,rust-chrono-0.4) + ("rust-either" ,rust-either-1) + ("rust-indexmap" ,rust-indexmap-1) + ("rust-schemars-derive" ,rust-schemars-derive-0.6) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-smallvec" ,rust-smallvec-1) + ("rust-uuid" ,rust-uuid-0.8)) + #:cargo-development-inputs + (("rust-pretty-assertions" ,rust-pretty-assertions-0.6)))))) + (define-public rust-schemars-derive-0.8 (package (name "rust-schemars-derive") - (version "0.8.8") + (version "0.8.20") (source (origin (method url-fetch) (uri (crate-uri "schemars_derive" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "16xfvm16d8nsxdx82fdcyqfi12v61lffyf1wmi34qqg82g74vbj1")))) + (base32 "1lzlj36qcjjpynadbi4x152i5pd2wbv42p8n3bin5ycgrv6a3m9y")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) ("rust-quote" ,rust-quote-1) - ("rust-serde-derive-internals" ,rust-serde-derive-internals-0.25) + ("rust-serde-derive-internals" ,rust-serde-derive-internals-0.29) ("rust-syn" ,rust-syn-1)) #:cargo-development-inputs - (("rust-pretty-assertions" ,rust-pretty-assertions-0.6)))) + (("rust-pretty-assertions" ,rust-pretty-assertions-1)))) (home-page "https://graham.cool/schemars/") (synopsis "Macros for @code{#[derive(JsonSchema)]}, for use with schemars") (description "This package provides macros for @code{#[derive(JsonSchema)]}, for use with schemars.") (license license:expat))) +(define-public rust-schemars-derive-0.6 + (package + (inherit rust-schemars-derive-0.8) + (name "rust-schemars-derive") + (version "0.6.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "schemars_derive" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1a9h8bqqqd0i6605gyhz2jw2hi1wq1vfi262qrflkn3pyk75wlrq")))) + (arguments + `(#:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-serde-derive-internals" ,rust-serde-derive-internals-0.25) + ("rust-syn" ,rust-syn-1)) + #:cargo-development-inputs + (("rust-pretty-assertions" ,rust-pretty-assertions-0.6)))))) + (define-public rust-scoped-threadpool-0.1 (package (name "rust-scoped-threadpool") @@ -58996,7 +67403,7 @@ library's old @code{scoped_thread_local!} macro for providing scoped access to (define-public rust-scopeguard-1 (package (name "rust-scopeguard") - (version "1.1.0") + (version "1.2.0") (source (origin (method url-fetch) @@ -59004,7 +67411,7 @@ library's old @code{scoped_thread_local!} macro for providing scoped access to (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1kbqm85v43rq92vx7hfiay6pmcga03vrjbbfwqpyj3pwsg3b16nj")))) + "0jcz9sd47zlsgcnm1hdw0664krxwb5gczlif4qngj2aif8vky54l")))) (build-system cargo-build-system) (home-page "https://github.com/bluss/scopeguard") (synopsis "Scope guard which will run a closure even out of scope") @@ -59031,6 +67438,25 @@ with one of the implemented strategies.") (base32 "09sy9wbqp409pkwmqni40qmwa99ldqpl48pp95m1xw8sc19qy9cl")))))) +(define-public rust-scopetime-0.1 + (package + (name "rust-scopetime") + (version "0.1.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "scopetime" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1ngkasx6l072cvigx7q5r33i8acjardr4g8jnwdrcym4758f5vb6")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-log" ,rust-log-0.4)))) + (home-page "https://github.com/extrawurst/gitui") + (synopsis "Log scope runtime") + (description "This create is for logging runtime of arbitrary scope.") + (license license:expat))) + (define-public rust-scraper-0.12 (package (name "rust-scraper") @@ -59423,6 +67849,19 @@ Pwrite traits from the scroll crate.") notifications.") (license (list license:expat license:asl2.0)))) +(define-public rust-sd-notify-0.3 + (package + (inherit rust-sd-notify-0.4) + (name "rust-sd-notify") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "sd-notify" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1j1ff6hhzcyh3m9c0adxnnjrasnvl1v6qaiv5vj2zgajz0hqml0c")))))) + (define-public rust-seahash-3 (package (name "rust-seahash") @@ -59658,17 +68097,72 @@ statistical guarantees.") in stable Rust.") (license license:asl2.0))) +(define-public rust-selinux-0.4 + (package + (name "rust-selinux") + (version "0.4.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "selinux" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "02vy0n6rrhh8idxadi5xjmv5phvfg1f8jg5cwmjzvzxvkcg1ndsk")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; Not all files included. + #:cargo-inputs + (("rust-bitflags" ,rust-bitflags-2) + ("rust-libc" ,rust-libc-0.2) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-reference-counted-singleton" ,rust-reference-counted-singleton-0.1) + ("rust-selinux-sys" ,rust-selinux-sys-0.6) + ("rust-thiserror" ,rust-thiserror-1)) + #:cargo-development-inputs (("rust-assert-matches" ,rust-assert-matches-1) + ("rust-serial-test" ,rust-serial-test-3) + ("rust-socketpair" ,rust-socketpair-0.19) + ("rust-tempfile" ,rust-tempfile-3)))) + (inputs (list clang libselinux)) + (home-page "https://codeberg.org/koutheir/selinux.git") + (synopsis "Flexible Mandatory Access Control for Linux") + (description "This package provides a Rust interface to the flexible +Mandatory Access Control for Linux.") + (license license:expat))) + +(define-public rust-selinux-sys-0.6 + (package + (name "rust-selinux-sys") + (version "0.6.9") + (source + (origin + (method url-fetch) + (uri (crate-uri "selinux-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1v2z4002x3k7vzfq3z2p05xn85f0439iybmpxg47xh9x6yc59m49")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-bindgen" ,rust-bindgen-0.69) + ("rust-cc" ,rust-cc-1) + ("rust-dunce" ,rust-dunce-1) + ("rust-walkdir" ,rust-walkdir-2)))) + (inputs (list clang libselinux)) + (home-page "https://codeberg.org/koutheir/selinux-sys.git") + (synopsis "Flexible Mandatory Access Control (MAC) for Linux") + (description "Flexible Mandatory Access Control (MAC) for Linux.") + (license license:expat))) + (define-public rust-semver-1 (package (name "rust-semver") - (version "1.0.20") + (version "1.0.22") (source (origin (method url-fetch) (uri (crate-uri "semver" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "140hmbfa743hbmah1zjf07s8apavhvn04204qjigjiz5w6iscvw3")))) + (base32 "1jir6q2ps4s5v52bqxpvwj35p0m0ahl5pf62ppwksbv5kvk3zm4j")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -59896,10 +68390,31 @@ formats: @end itemize") (license license:expat))) +(define-public rust-seq-macro-0.3 + (package + (name "rust-seq-macro") + (version "0.3.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "seq-macro" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1d50kbaslrrd0374ivx15jg57f03y5xzil1wd2ajlvajzlkbzw53")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-development-inputs (("rust-rustversion" ,rust-rustversion-1) + ("rust-trybuild" ,rust-trybuild-1)))) + (home-page "https://github.com/dtolnay/seq-macro") + (synopsis "Repeat sequentially indexed copies of a fragment of code") + (description + "Macro to repeat sequentially indexed copies of a fragment of code.") + (license (list license:expat license:asl2.0)))) + (define-public rust-serde-1 (package (name "rust-serde") - (version "1.0.194") + (version "1.0.197") (source (origin (method url-fetch) @@ -59907,7 +68422,7 @@ formats: (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0wxplk1ayrsb81bdwh8zmkldw1b0xigs3qc90r5ck6374nc4848b")))) + "1qjcxqd3p4yh5cmmax9q4ics1zy34j5ij32cvjj5dc5rw5rwic9z")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -60336,7 +68851,7 @@ TOML/JSON/MessagePack strings and serializable values.") (define-public rust-serde-derive-1 (package (name "rust-serde-derive") - (version "1.0.194") + (version "1.0.197") (source (origin (method url-fetch) @@ -60344,7 +68859,7 @@ TOML/JSON/MessagePack strings and serializable values.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1q6l0ycrykdg960c350fgnac6d653q1v608g84qrk3rf692mwf53")))) + "02v1x0sdv8qy06lpr6by4ar1n3jz3hmab15cgimpzhgd895v7c3y")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -60387,29 +68902,46 @@ TOML/JSON/MessagePack strings and serializable values.") ("rust-serde-codegen-internals" ,rust-serde-codegen-internals-0.14) ("rust-syn" ,rust-syn-0.11)))))) -(define-public rust-serde-derive-internals-0.26 +(define-public rust-serde-derive-internals-0.29 (package (name "rust-serde-derive-internals") - (version "0.26.0") + (version "0.29.1") (source (origin (method url-fetch) (uri (crate-uri "serde_derive_internals" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0g2zdr6s8i0r29yy7pdl6ahimq8w6ck70hvrciiry2ljwwlq5gw5")))) + (base32 "04g7macx819vbnxhi52cx0nhxi56xlhrybgwybyy7fb9m4h6mlhq")))) (build-system cargo-build-system) (arguments - `(#:tests? #f ; no variant or associated item named `__TestExhaustive` - #:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) + `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) ("rust-quote" ,rust-quote-1) - ("rust-syn" ,rust-syn-1)))) + ("rust-syn" ,rust-syn-2)))) (home-page "https://serde.rs") (synopsis "AST representation used by Serde derive macros") (description "This package provides AST representation used by Serde derive macros.") (license (list license:expat license:asl2.0)))) +(define-public rust-serde-derive-internals-0.26 + (package + (inherit rust-serde-derive-internals-0.29) + (name "rust-serde-derive-internals") + (version "0.26.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "serde_derive_internals" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0g2zdr6s8i0r29yy7pdl6ahimq8w6ck70hvrciiry2ljwwlq5gw5")))) + (arguments + `(#:tests? #f ; no variant or associated item named `__TestExhaustive` + #:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)))))) + (define-public rust-serde-derive-internals-0.25 (package (inherit rust-serde-derive-internals-0.26) @@ -60457,18 +68989,17 @@ 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.111") + (version "1.0.114") (source (origin (method url-fetch) (uri (crate-uri "serde_json" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1x441azvvdy6x8am4bvkxhswhzw5cr8ml0cqspnihvri8bx4cvhp")))) + (base32 "1q4saigxwkf8bw4y5kp6k33dnavlvvwa2q4zmag59vrjsqdrpw65")))) (build-system cargo-build-system) (arguments - `(#:tests? #f ; could not find `RandomState` in `hash` - #:cargo-inputs + `(#:cargo-inputs (("rust-indexmap" ,rust-indexmap-2) ("rust-itoa" ,rust-itoa-1) ("rust-ryu" ,rust-ryu-1) @@ -60582,8 +69113,45 @@ programs in rust.") "This package provides a path to the element that failed to deserialize.") (license (list license:expat license:asl2.0)))) +(define-public rust-serde-qs-0.8 + (package + (name "rust-serde-qs") + (version "0.8.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "serde_qs" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "19pngnlga4xnap85kdvn661662hf42lkkppp9sd04py7xs056wf7")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-actix-web" ,rust-actix-web-3) + ("rust-actix-web" ,rust-actix-web-2) + ("rust-futures" ,rust-futures-0.3) + ("rust-percent-encoding" ,rust-percent-encoding-2) + ("rust-serde" ,rust-serde-1) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-tracing" ,rust-tracing-0.1) + ("rust-warp" ,rust-warp-0.3)) + #:cargo-development-inputs + (("rust-csv" ,rust-csv-1) + ("rust-rand" ,rust-rand-0.8) + ("rust-serde-derive" ,rust-serde-derive-1) + ("rust-serde-urlencoded" ,rust-serde-urlencoded-0.7) + ("rust-serde-with" ,rust-serde-with-1)))) + (home-page "https://github.com/samscott89/serde_qs") + (synopsis "Querystrings for Serde") + (description + "This crate is a Rust library for serialising to and deserialising from +querystrings. This crate is designed to extend @code{serde_urlencoded} when +using nested parameters, similar to those used by @code{qs} for Node, and +commonly used by Ruby on Rails via Rack.") + (license (list license:expat license:asl2.0)))) + (define-public rust-serde-qs-0.7 (package + (inherit rust-serde-qs-0.8) (name "rust-serde-qs") (version "0.7.2") (source @@ -60593,7 +69161,6 @@ programs in rust.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "1jz6gpr02d393f8cwdxbgfl3jhx5svr1z5ilxhdh16slqvijvy2s")))) - (build-system cargo-build-system) (arguments ;; XXX: The crate fails to't build with with the same error as ;; rust-actix-connect. Skip build for now. @@ -60607,15 +69174,7 @@ programs in rust.") ("rust-thiserror" ,rust-thiserror-1)) #:cargo-development-inputs (("rust-csv" ,rust-csv-1) - ("rust-serde-urlencoded" ,rust-serde-urlencoded-0.7)))) - (home-page "https://github.com/samscott89/serde_qs") - (synopsis "Querystrings for Serde") - (description - "This crate is a Rust library for serialising to and deserialising from -querystrings. This crate is designed to extend @code{serde_urlencoded} when -using nested parameters, similar to those used by @code{qs} for Node, and -commonly used by Ruby on Rails via Rack.") - (license (list license:expat license:asl2.0)))) + ("rust-serde-urlencoded" ,rust-serde-urlencoded-0.7)))))) (define-public rust-serde-regex-1 (package @@ -60675,16 +69234,20 @@ of a C-like enum.") (define-public rust-serde-spanned-0.6 (package (name "rust-serde-spanned") - (version "0.6.4") + (version "0.6.5") (source (origin (method url-fetch) (uri (crate-uri "serde_spanned" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "102ym47sr1y48ml42wjv6aq8y77bij1qckx1j0gb3rbka21jn0hj")))) + (base32 "1hgh6s3jjwyzhfk3xwb6pnnr1misq9nflwq0f026jafi37s24dpb")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs (("rust-serde" ,rust-serde-1)))) + `(#:tests? #f ; unresolved import `toml` + #:cargo-inputs (("rust-serde" ,rust-serde-1)) + #:cargo-development-inputs (("rust-serde" ,rust-serde-1) + ("rust-serde-derive" ,rust-serde-derive-1) + ("rust-serde-untagged" ,rust-serde-untagged-0.1)))) (home-page "https://github.com/toml-rs/toml") (synopsis "Encoder and decoder of TOML-formatted files and streams") (description "This package provides a native Rust encoder and decoder of @@ -60794,6 +69357,27 @@ by dynamically growing the stack.") ((", path = \"../serde\"") "")) #t))))))) +(define-public rust-serde-transcode-1 + (package + (name "rust-serde-transcode") + (version "1.1.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "serde-transcode" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1qlh34kw4knbs83xy6x0wwbb71pbiivcw6swpy2nxfx5q8jhw32r")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-serde" ,rust-serde-1)) + #:cargo-development-inputs (("rust-serde-json" ,rust-serde-json-1)))) + (home-page "https://github.com/sfackler/serde-transcode") + (synopsis "Transcode from one Serde format to another") + (description "This package provides functions to transcode from one Serde +format to another.") + (license (list license:expat license:asl2.0)))) + (define-public rust-serde-untagged-0.1 (package (name "rust-serde-untagged") @@ -60895,14 +69479,14 @@ for later processing.") (define-public rust-serde-with-3 (package (name "rust-serde-with") - (version "3.4.0") + (version "3.8.1") (source (origin (method url-fetch) (uri (crate-uri "serde_with" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "08sw83b6hfwzylr0waf4mc29h6fxnb02g7vkwbkjjyhvrin27kb4")) + (base32 "082a7j42h79rs2jzafw67lay0497hnip56fdxfjxaj81mg987m0a")) (modules '((guix build utils))) (snippet '(begin (substitute* "Cargo.toml" @@ -60910,12 +69494,13 @@ for later processing.") (string-append "\"^" version))))))) (build-system cargo-build-system) (arguments - `(#:cargo-test-flags + `(#:skip-build? #t ; Not all dependencies packaged + #:cargo-test-flags '("--release" "--" ;; Test fails in release tarball. "--skip=test_serde_with_macros_dependency") #:cargo-inputs - (("rust-base64" ,rust-base64-0.21) + (("rust-base64" ,rust-base64-0.22) ("rust-chrono" ,rust-chrono-0.4) ("rust-doc-comment" ,rust-doc-comment-0.3) ("rust-document-features" ,rust-document-features-0.2) @@ -60923,7 +69508,9 @@ for later processing.") ("rust-hex" ,rust-hex-0.4) ("rust-indexmap" ,rust-indexmap-1) ("rust-indexmap" ,rust-indexmap-2) + ("rust-schemars" ,rust-schemars-0.8) ("rust-serde" ,rust-serde-1) + ("rust-serde-derive" ,rust-serde-derive-1) ("rust-serde-json" ,rust-serde-json-1) ("rust-serde-with-macros" ,rust-serde-with-macros-3) ("rust-time" ,rust-time-0.3)) @@ -60931,35 +69518,76 @@ for later processing.") (("rust-expect-test" ,rust-expect-test-1) ("rust-fnv" ,rust-fnv-1) ("rust-glob" ,rust-glob-0.3) + ;("rust-jsonschema" ,rust-jsonschema-0.17) ("rust-mime" ,rust-mime-0.3) ("rust-pretty-assertions" ,rust-pretty-assertions-1) ("rust-regex" ,rust-regex-1) ("rust-rmp-serde" ,rust-rmp-serde-1) ("rust-ron" ,rust-ron-0.8) ("rust-rustversion" ,rust-rustversion-1) + ("rust-schemars" ,rust-schemars-0.8) + ("rust-serde" ,rust-serde-1) ("rust-serde-xml-rs" ,rust-serde-xml-rs-0.6) ("rust-serde-json" ,rust-serde-json-1) ("rust-serde-test" ,rust-serde-test-1) ("rust-serde-yaml" ,rust-serde-yaml-0.9) - ("rust-version-sync" ,rust-version-sync-0.9) - ("rust-xml-rs" ,rust-xml-rs-0.8)))) + ("rust-version-sync" ,rust-version-sync-0.9)))) (home-page "https://github.com/jonasbb/serde_with/") (synopsis "Custom de/serialization functions for Rust's serde") (description "This package provides custom de/serialization functions for Rust's serde.") (license (list license:expat license:asl2.0)))) +(define-public rust-serde-with-1 + (package + (inherit rust-serde-with-3) + (name "rust-serde-with") + (version "1.14.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "serde_with" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1zqjlc9ypm8y0r9bcgdhh62zcdn2yzfxh31dsbn01gshkq35m2v7")))) + (arguments + `(#:tests? #f ; could not find `Deserializer` in `serde_test` + #:cargo-inputs (("rust-base64" ,rust-base64-0.13) + ("rust-chrono" ,rust-chrono-0.4) + ("rust-doc-comment" ,rust-doc-comment-0.3) + ("rust-hex" ,rust-hex-0.4) + ("rust-indexmap" ,rust-indexmap-1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-serde-with-macros" ,rust-serde-with-macros-1) + ("rust-time" ,rust-time-0.3)) + #:cargo-development-inputs + (("rust-expect-test" ,rust-expect-test-1) + ("rust-fnv" ,rust-fnv-1) + ("rust-glob" ,rust-glob-0.3) + ("rust-mime" ,rust-mime-0.3) + ("rust-pretty-assertions" ,rust-pretty-assertions-1) + ("rust-regex" ,rust-regex-1) + ("rust-rmp-serde" ,rust-rmp-serde-1) + ("rust-ron" ,rust-ron-0.7) + ("rust-rustversion" ,rust-rustversion-1) + ("rust-serde-xml-rs" ,rust-serde-xml-rs-0.5) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-serde-test" ,rust-serde-test-1) + ("rust-serde-yaml" ,rust-serde-yaml-0.8) + ("rust-version-sync" ,rust-version-sync-0.9)))))) + (define-public rust-serde-with-macros-3 (package (name "rust-serde-with-macros") - (version "3.4.0") + (version "3.8.1") (source (origin (method url-fetch) (uri (crate-uri "serde_with_macros" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1277nm0ry2bs52zd5kkddgkzk5s2mhi80x74dnqj68ssyyslwqwk")))) + (base32 "1qmwh1bw83p8h24ijmivfaz0nifhkdvwbcdvr25kwi215xq9nmk5")))) (build-system cargo-build-system) (arguments `(#:cargo-test-flags @@ -60985,6 +69613,31 @@ Rust's serde.") @code{serde_with}.") (license (list license:expat license:asl2.0)))) +(define-public rust-serde-with-macros-1 + (package + (inherit rust-serde-with-macros-3) + (name "rust-serde-with-macros") + (version "1.5.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "serde_with_macros" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "10l0rsy0k61nvpn1brcfvzp8yfnvsqdgh6zdwp03qf85dzndd0p1")))) + (arguments + `(#:cargo-inputs (("rust-darling" ,rust-darling-0.13) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)) + #:cargo-development-inputs + (("rust-pretty-assertions" ,rust-pretty-assertions-1) + ("rust-rustversion" ,rust-rustversion-1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-trybuild" ,rust-trybuild-1) + ("rust-version-sync" ,rust-version-sync-0.9)))))) + (define-public rust-serde-xml-rs-0.6 (package (name "rust-serde-xml-rs") @@ -61149,8 +69802,38 @@ Rust's serde.") (description "Native Serde adapter for wasm-bindgen.") (license license:expat))) +(define-public rust-serial-test-3 + (package + (name "rust-serial-test") + (version "3.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "serial_test" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1381b9z83a0a39sx0jrrf1q91m08s1yhjp648g5sgb1s5csdjflm")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-dashmap" ,rust-dashmap-5) + ("rust-document-features" ,rust-document-features-0.2) + ("rust-fslock" ,rust-fslock-0.2) + ("rust-futures" ,rust-futures-0.3) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-log" ,rust-log-0.4) + ("rust-parking-lot" ,rust-parking-lot-0.12) + ("rust-serial-test-derive" ,rust-serial-test-derive-3)) + #:cargo-development-inputs (("rust-itertools" ,rust-itertools-0.10) + ("rust-tokio" ,rust-tokio-1)))) + (home-page "https://github.com/palfrey/serial_test") + (synopsis "Allows for the creation of serialised Rust tests") + (description + "This package allows for the creation of serialised Rust tests.") + (license license:expat))) + (define-public rust-serial-test-2 (package + (inherit rust-serial-test-3) (name "rust-serial-test") (version "2.0.0") (source @@ -61160,7 +69843,6 @@ Rust's serde.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "0b9v0csv9wxl1gcjq99plwimxbmhgr6kzbwqyb457qh3d22xsmhf")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-dashmap" ,rust-dashmap-5) @@ -61173,12 +69855,7 @@ Rust's serde.") ("rust-serial-test-derive" ,rust-serial-test-derive-2)) #:cargo-development-inputs (("rust-itertools" ,rust-itertools-0.10) - ("rust-tokio" ,rust-tokio-1)))) - (home-page "https://github.com/palfrey/serial_test") - (synopsis "Allows for the creation of serialised Rust tests") - (description - "This package allows for the creation of serialised Rust tests.") - (license license:expat))) + ("rust-tokio" ,rust-tokio-1)))))) (define-public rust-serial-test-1 (package @@ -61285,8 +69962,33 @@ Rust's serde.") `(#:cargo-inputs (("rust-lazy-static" ,rust-lazy-static-1)))))) +(define-public rust-serial-test-derive-3 + (package + (name "rust-serial-test-derive") + (version "3.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "serial_test_derive" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "04i240k9ml91nz2knj2qxaksm6qnqj65xm7p8wdsq880qynv8gxr")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-2)) + #:cargo-development-inputs (("rust-env-logger" ,rust-env-logger-0.10) + ("rust-prettyplease" ,rust-prettyplease-0.2)))) + (home-page "https://github.com/palfrey/serial_test") + (synopsis "Helper crate for serial_test") + (description + "This package is an helper crate for @code{rust-serial-test}.") + (license license:expat))) + (define-public rust-serial-test-derive-2 (package + (inherit rust-serial-test-derive-3) (name "rust-serial-test-derive") (version "2.0.0") (source @@ -61296,19 +69998,13 @@ Rust's serde.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "13zvd5ds76hhjn3z0axc05n15lzpxpz77jcykic8q5knhlbjklci")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) ("rust-quote" ,rust-quote-1) ("rust-syn" ,rust-syn-2)) #:cargo-development-inputs - (("rust-env-logger" ,rust-env-logger-0.10)))) - (home-page "https://github.com/palfrey/serial_test") - (synopsis "Helper crate for serial_test") - (description - "This package is an helper crate for @code{rust-serial-test}.") - (license license:expat))) + (("rust-env-logger" ,rust-env-logger-0.10)))))) (define-public rust-serial-test-derive-1 (package @@ -61580,24 +70276,34 @@ functionality and without weak references.") "This package provides a Rust-friendly interface to lm-sensors.") (license license:miros))) -(define-public rust-shadow-rs-0.8 +(define-public rust-shadow-rs-0.26 (package (name "rust-shadow-rs") - (version "0.8.1") + (version "0.26.1") (source (origin (method url-fetch) (uri (crate-uri "shadow-rs" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0iy4f6yzag52qr93hjhm2l8crxhjblr91nffbdd8zzw0xchfjdc9")))) + (base32 "15xrlf66f10773k9kwpvz8909akfjspyy0yy9ss665wrfs15qp1y")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-chrono" ,rust-chrono-0.4) - ("rust-git2" ,rust-git2-0.13) - ("rust-is-debug" ,rust-is-debug-1)))) + `(#:cargo-test-flags + '("--release" "--" + "--skip=date_time::tests::test_local_now_human_format" + "--skip=git::tests::test_command_last_tag" + "--skip=git::tests::test_current_branch" + "--skip=git::tests::test_git") + #:cargo-inputs (("rust-const-format" ,rust-const-format-0.2) + ("rust-document-features" ,rust-document-features-0.2) + ("rust-git2" ,rust-git2-0.18) + ("rust-is-debug" ,rust-is-debug-1) + ("rust-time" ,rust-time-0.3) + ("rust-tzdb" ,rust-tzdb-0.6)) + #:cargo-development-inputs (("rust-winnow" ,rust-winnow-0.5)))) + (native-inputs (list pkg-config)) + (inputs (list libgit2-1.7 zlib)) (home-page "https://github.com/baoyachi/shadow-rs") (synopsis "Recall properties of the build process at run time") (description @@ -61606,6 +70312,24 @@ and environment at run time. You can use this tool to check in production exactly where a binary came from and how it was built.") (license (list license:expat license:asl2.0)))) +(define-public rust-shadow-rs-0.8 + (package + (inherit rust-shadow-rs-0.26) + (name "rust-shadow-rs") + (version "0.8.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "shadow-rs" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0iy4f6yzag52qr93hjhm2l8crxhjblr91nffbdd8zzw0xchfjdc9")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs (("rust-chrono" ,rust-chrono-0.4) + ("rust-git2" ,rust-git2-0.13) + ("rust-is-debug" ,rust-is-debug-1)))))) + (define-public rust-shannon-0.2 (package (name "rust-shannon") @@ -61800,14 +70524,14 @@ some context).") (define-public rust-shlex-1 (package (name "rust-shlex") - (version "1.2.0") + (version "1.3.0") (source (origin (method url-fetch) (uri (crate-uri "shlex" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1033pj9dyb76nm5yv597nnvj3zpvr2aw9rm5wy0gah3dk99f1km7")))) + (base32 "0r1y6bv26c1scpxvhg2cabimrmwgbp4p3wy6syj9n0c4s3q2znhg")))) (build-system cargo-build-system) (home-page "https://github.com/comex/rust-shlex") (synopsis "Split a string into shell words, like Python's shlex") @@ -62168,7 +70892,7 @@ CPUs, as well as raw interfaces to platform-specific instructions. (define-public rust-simd-adler32-0.3 (package (name "rust-simd-adler32") - (version "0.3.4") + (version "0.3.7") (source (origin (method url-fetch) @@ -62176,7 +70900,7 @@ CPUs, as well as raw interfaces to platform-specific instructions. (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "060b9v15s3miq06582cj2ywam92ph6xs34s62mc8az3xc4wxz98l")))) + "1zkq40c3iajcnr5936gjp9jjh1lpzhy44p3dq3fiw75iwr1w2vfn")))) (build-system cargo-build-system) (arguments `(#:cargo-development-inputs @@ -62185,8 +70909,7 @@ CPUs, as well as raw interfaces to platform-specific instructions. ("rust-criterion" ,rust-criterion-0.3) ("rust-rand" ,rust-rand-0.8)))) (home-page "https://github.com/mcountryman/simd-adler32") - (synopsis - "Adler-32 rolling hash algorithm implementation") + (synopsis "Adler-32 rolling hash algorithm implementation") (description "This package provides a SIMD-accelerated Adler-32 rolling hash algorithm implementation in Rust.") @@ -62216,6 +70939,59 @@ implementation in Rust.") "This package provides helpers to write more compact simd code.") (license license:expat))) +(define-public rust-simd-json-0.13 + (package + (name "rust-simd-json") + (version "0.13.8") + (source + (origin + (method url-fetch) + (uri (crate-uri "simd-json" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0xmzpzklnxxnwspf7abhzgr3khbnrw4h8svag8rq9i4v3c88zbrg")) + (snippet + #~(begin (use-modules (guix build utils)) + ;; Remove some of the optional dependencies: + (substitute* "Cargo.toml.orig" + ((".*alloc_counter.*") "") + ((".*colored.*") "") + ((".*jemallocator.*") "") + ((".*perfcnt.*") "")) + (rename-file "Cargo.toml.orig" "Cargo.toml"))))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-ahash" ,rust-ahash-0.8) + ;("rust-alloc-counter" ,rust-alloc-counter-0.0.4) + ("rust-beef" ,rust-beef-0.5) + ;("rust-colored" ,rust-colored-2) + ("rust-getopts" ,rust-getopts-0.2) + ("rust-getrandom" ,rust-getrandom-0.2) + ("rust-halfbrown" ,rust-halfbrown-0.2) + ;("rust-jemallocator" ,rust-jemallocator-0.5) + ("rust-lexical-core" ,rust-lexical-core-0.8) + ("rust-once-cell" ,rust-once-cell-1) + ;("rust-perfcnt" ,rust-perfcnt-0.8) + ("rust-ref-cast" ,rust-ref-cast-1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-simdutf8" ,rust-simdutf8-0.1) + ("rust-value-trait" ,rust-value-trait-0.8)) + #:cargo-development-inputs (("rust-core-affinity" ,rust-core-affinity-0.8) + ("rust-criterion" ,rust-criterion-0.5) + ("rust-float-cmp" ,rust-float-cmp-0.9) + ("rust-getopts" ,rust-getopts-0.2) + ("rust-proptest" ,rust-proptest-1)) + #:phases + (modify-phases %standard-phases + (add-before 'check 'pre-check + (lambda _ + (delete-file "tests/jsonchecker.rs")))))) + (home-page "https://github.com/simd-lite/simd-json") + (synopsis "High performance JSON parser based on a port of simdjson") + (description "High performance JSON parser based on a port of simdjson.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-simdutf8-0.1 (package (name "rust-simdutf8") @@ -62239,14 +71015,14 @@ extensions.") (define-public rust-similar-2 (package (name "rust-similar") - (version "2.2.1") + (version "2.4.0") (source (origin (method url-fetch) (uri (crate-uri "similar" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1kszsllryv6lh6771ah0apqk57qh4jp9mrlr1hhkiq6smx2cn2j2")))) + "08gspd5a2w21k9s641z6fxvrzj34611rcjbjr5685vh9r8da9zij")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -62341,6 +71117,25 @@ diff output.") small to medium sized project") (license (list license:expat license:asl2.0)))) +(define-public rust-simplerand-1 + (package + (name "rust-simplerand") + (version "1.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "simplerand" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0yw9p3sk5c57gwz60ydpvsbx9kkwyccwlcv0z3q4v66b4455libh")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-lazy-static" ,rust-lazy-static-1)))) + (home-page "https://github.com/PumpkinSeed/srand") + (synopsis "Random number generator") + (description "Simple and fast random number generator.") + (license license:expat))) + (define-public rust-simple-logger-4 (package (name "rust-simple-logger") @@ -62950,46 +71745,23 @@ implementations.") (define-public rust-slog-async-2 (package (name "rust-slog-async") - (version "2.6.0") + (version "2.8.0") (source (origin (method url-fetch) (uri (crate-uri "slog-async" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1p7v0jl82snmk1c7f6ch528ladzyprlk5gzaqkdqa342ky3i6266")))) + (base32 "113b17aw7jx7mr68vwfq2yiv6mb4702hz6a0g587jb4ai67h7j3j")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-crossbeam-channel" ,rust-crossbeam-channel-0.5) ("rust-slog" ,rust-slog-2) ("rust-take-mut" ,rust-take-mut-0.2) ("rust-thread-local" ,rust-thread-local-1)))) (home-page "https://github.com/slog-rs/slog") (synopsis "Asynchronous drain for @code{slog-rs}") - (description "This package provides an asynchronous drain for slog.") - (license (list license:mpl2.0 license:expat license:asl2.0)))) - -(define-public rust-slog-async-2-8 - (package - (name "rust-slog-async") - (version "2.8.0") - (source - (origin - (method url-fetch) - (uri (crate-uri "slog-async" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 "113b17aw7jx7mr68vwfq2yiv6mb4702hz6a0g587jb4ai67h7j3j")))) - (build-system cargo-build-system) - (arguments - `(#:cargo-inputs (("rust-crossbeam-channel" ,rust-crossbeam-channel-0.5) - ("rust-slog" ,rust-slog-2) - ("rust-take-mut" ,rust-take-mut-0.2) - ("rust-thread-local" ,rust-thread-local-1)))) - (home-page "https://github.com/slog-rs/slog") - (synopsis "Asynchronous drain for slog-rs") (description "This package provides an asynchronous drain for slog-rs, the Rust logging library.") @@ -63216,26 +71988,25 @@ Unicode strings.") (define-public rust-sluice-0.5 (package (name "rust-sluice") - (version "0.5.3") + (version "0.5.5") (source (origin (method url-fetch) (uri (crate-uri "sluice" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1w9brs9dqyvr2w7cs5nxkp2wggw2xh76bc4qq0p4yxwfvhgfs94f")))) + (base32 "1d9ywr5039ibgaby8sc72f8fs5lpp8j5y6p3npya4jplxz000x3d")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-futures-channel" ,rust-futures-channel-0.3) + (("rust-async-channel" ,rust-async-channel-1) ("rust-futures-core" ,rust-futures-core-0.3) ("rust-futures-io" ,rust-futures-io-0.3)) #:cargo-development-inputs - (("rust-cfg-if" ,rust-cfg-if-1) - ("rust-criterion" ,rust-criterion-0.3) + (("rust-criterion" ,rust-criterion-0.3) ("rust-futures" ,rust-futures-0.3) - ("rust-quickcheck" ,rust-quickcheck-0.9) - ("rust-quickcheck-macros" ,rust-quickcheck-macros-0.9)))) + ("rust-quickcheck" ,rust-quickcheck-1) + ("rust-quickcheck-macros" ,rust-quickcheck-macros-1)))) (home-page "https://github.com/sagebind/sluice") (synopsis "Ring buffer for byte buffers, FIFO queues, and SPSC channels") (description @@ -63268,14 +72039,14 @@ inline storage.") (define-public rust-smallvec-1 (package (name "rust-smallvec") - (version "1.11.1") + (version "1.13.1") (source (origin (method url-fetch) (uri (crate-uri "smallvec" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0nmx8aw3v4jglqdcjv4hhn10d6g52c4bhjlzwf952885is04lawl")))) + (base32 "1mzk9j117pn3k1gabys0b7nz8cdjsx5xc6q7fwnm8r0an62d7v76")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -63700,14 +72471,14 @@ algorithm. Includes streaming compression and decompression.") (define-public rust-snapbox-macros-0.3 (package (name "rust-snapbox-macros") - (version "0.3.7") + (version "0.3.8") (source (origin (method url-fetch) (uri (crate-uri "snapbox-macros" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0rxn80n3y6h7cp75zd3g3akpw3whh31fhvv9zy20k55dk82xxk3q")))) + "0h6yy5h83y17bghi1lq9pw3knbqba1rwns20flian5axn0wbii71")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-anstream" ,rust-anstream-0.6)))) @@ -63739,8 +72510,58 @@ It is also flexible enough to build your own test harness like @code{trycmd}.") (base32 "0c79lnjcs9yp62y665swv5y5y6088qc256bfr3s7xcnb0izfl7f0")))))) +(define-public rust-snapbox-0.5 + (package + (name "rust-snapbox") + (version "0.5.9") + (source + (origin + (method url-fetch) + (uri (crate-uri "snapbox" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0ajnz1yv53jh667gdj4jpapy3g7sadnkfzyl4f2gcy7nxkhl3i4a")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-anstream" ,rust-anstream-0.6) + ("rust-anstyle" ,rust-anstyle-1) + ("rust-anstyle-svg" ,rust-anstyle-svg-0.1) + ("rust-backtrace" ,rust-backtrace-0.3) + ("rust-content-inspector" ,rust-content-inspector-0.2) + ("rust-document-features" ,rust-document-features-0.2) + ("rust-dunce" ,rust-dunce-1) + ("rust-escargot" ,rust-escargot-0.5) + ("rust-filetime" ,rust-filetime-0.2) + ("rust-ignore" ,rust-ignore-0.4) + ("rust-libc" ,rust-libc-0.2) + ("rust-libtest-mimic" ,rust-libtest-mimic-0.7) + ("rust-normalize-line-endings" ,rust-normalize-line-endings-0.3) + ("rust-os-pipe" ,rust-os-pipe-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-similar" ,rust-similar-2) + ("rust-snapbox-macros" ,rust-snapbox-macros-0.3) + ("rust-tempfile" ,rust-tempfile-3) + ("rust-wait-timeout" ,rust-wait-timeout-0.2) + ("rust-walkdir" ,rust-walkdir-2) + ("rust-windows-sys" ,rust-windows-sys-0.52)))) + (home-page "https://github.com/assert-rs/trycmd/tree/main/crates/snapbox") + (synopsis "Snapshot testing toolbox") + (description + "Snapbox is a snapshot-testing toolbox that is ready to use for verifying +output from + +@itemize +@item Function return values +@item CLI stdout/stderr +@item Filesystem changes +@end itemize + +It is also flexible enough to build your own test harness like @code{trycmd}.") + (license (list license:expat license:asl2.0)))) + (define-public rust-snapbox-0.4 (package + (inherit rust-snapbox-0.5) (name "rust-snapbox") (version "0.4.16") (source (origin @@ -63750,7 +72571,6 @@ It is also flexible enough to build your own test harness like @code{trycmd}.") (sha256 (base32 "1v732vpzkjyawwvcq2xdf5q4s6bxrqmqih8kgc5gada9vwq5l53k")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-anstream" ,rust-anstream-0.6) @@ -63772,21 +72592,7 @@ It is also flexible enough to build your own test harness like @code{trycmd}.") ("rust-tempfile" ,rust-tempfile-3) ("rust-wait-timeout" ,rust-wait-timeout-0.2) ("rust-walkdir" ,rust-walkdir-2) - ("rust-windows-sys" ,rust-windows-sys-0.52)))) - (home-page "https://github.com/assert-rs/trycmd/tree/main/crates/snapbox") - (synopsis "Snapshot testing toolbox") - (description - "Snapbox is a snapshot-testing toolbox that is ready to use for verifying -output from - -@itemize -@item Function return values -@item CLI stdout/stderr -@item Filesystem changes -@end itemize - -It is also flexible enough to build your own test harness like @code{trycmd}.") - (license (list license:expat license:asl2.0)))) + ("rust-windows-sys" ,rust-windows-sys-0.52)))))) (define-public rust-snapbox-0.2 (package @@ -63904,6 +72710,33 @@ maximal amount of configuration possible intended.") #:cargo-development-inputs (("rust-tempdir" ,rust-tempdir-0.3)))))) +(define-public rust-socketpair-0.19 + (package + (name "rust-socketpair") + (version "0.19.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "socketpair" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0xln407qisgd1rrq54ff7b9dbm0mjwvkl17ry6bph4clz2vhvicx")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-async-std" ,rust-async-std-1) + ("rust-io-extras" ,rust-io-extras-0.18) + ("rust-io-lifetimes" ,rust-io-lifetimes-2) + ("rust-rustix" ,rust-rustix-0.38) + ("rust-tokio" ,rust-tokio-1) + ("rust-uuid" ,rust-uuid-1) + ("rust-windows-sys" ,rust-windows-sys-0.52)) + #:cargo-development-inputs (("rust-anyhow" ,rust-anyhow-1)))) + (home-page "https://github.com/sunfishcode/socketpair") + (synopsis "Cross-platform socketpair functionality") + (description + "This package provides cross-platform socketpair functionality.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-socks-0.3 (package (name "rust-socks") @@ -64465,6 +73298,37 @@ SPIR-V.") (("rust-libc" ,rust-libc-0.2) ("rust-sqlite3-sys" ,rust-sqlite3-sys-0.13)))))) +(define-public rust-sqlite3-parser-0.12 + (package + (name "rust-sqlite3-parser") + (version "0.12.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "sqlite3-parser" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1dx8j16ki2fsrwn1p36wnf079pvcs17549rin29x99vhkcpjbpcs")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-2) + ("rust-cc" ,rust-cc-1) + ("rust-fallible-iterator" ,rust-fallible-iterator-0.3) + ("rust-indexmap" ,rust-indexmap-2) + ("rust-log" ,rust-log-0.4) + ("rust-memchr" ,rust-memchr-2) + ("rust-phf" ,rust-phf-0.11) + ("rust-phf-codegen" ,rust-phf-codegen-0.11) + ("rust-phf-shared" ,rust-phf-shared-0.11) + ("rust-smallvec" ,rust-smallvec-1) + ("rust-uncased" ,rust-uncased-0.9) + ("rust-uncased" ,rust-uncased-0.9)) + #:cargo-development-inputs (("rust-env-logger" ,rust-env-logger-0.10)))) + (home-page "https://github.com/gwenn/lemon-rs") + (synopsis "SQL parser (as understood by SQLite)") + (description "This package provides an SQL parser (as understood by SQLite).") + (license (list license:asl2.0 license:expat)))) + (define-public rust-sqlite3-src-0.5 (package (name "rust-sqlite3-src") @@ -64598,6 +73462,95 @@ SPIR-V.") (("rust-libc" ,rust-libc-0.2) ("rust-sqlite3-src" ,rust-sqlite3-src-0.3)))))) +(define-public rust-sqlparser-0.43 + (package + (name "rust-sqlparser") + (version "0.43.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "sqlparser" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1m7mddhgj9j0hpw8lxzxbbzkrrmd4q019xq6sl5x6z5sbap4np7r")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-bigdecimal" ,rust-bigdecimal-0.4) + ("rust-log" ,rust-log-0.4) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-sqlparser-derive" ,rust-sqlparser-derive-0.2)) + #:cargo-development-inputs (("rust-matches" ,rust-matches-0.1) + ("rust-pretty-assertions" ,rust-pretty-assertions-1) + ("rust-simple-logger" ,rust-simple-logger-4)))) + (home-page "https://github.com/sqlparser-rs/sqlparser-rs") + (synopsis "Extensible SQL Lexer and Parser") + (description + "Extensible SQL Lexer and Parser with support for ANSI SQL:2011.") + (license license:asl2.0))) + +(define-public rust-sqlparser-0.39 + (package + (inherit rust-sqlparser-0.43) + (name "rust-sqlparser") + (version "0.39.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "sqlparser" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1mrbqjdqr179qnhy43d0dnrl3yipsp4qyji5rc68j4fyrg14sfvl")))) + (arguments + `(#:cargo-inputs (("rust-bigdecimal" ,rust-bigdecimal-0.4) + ("rust-log" ,rust-log-0.4) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-sqlparser-derive" ,rust-sqlparser-derive-0.1)) + #:cargo-development-inputs + (("rust-matches" ,rust-matches-0.1) + ("rust-pretty-assertions" ,rust-pretty-assertions-1) + ("rust-simple-logger" ,rust-simple-logger-4)))))) + +(define-public rust-sqlparser-derive-0.2 + (package + (name "rust-sqlparser-derive") + (version "0.2.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "sqlparser_derive" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0m05d4cxcsk1ljgy8zx79dibq62pdfbgp4zmfm9z2r2ma62y3ch1")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-2)))) + (home-page "https://github.com/sqlparser-rs/sqlparser-rs") + (synopsis "Implementation for sqlparser") + (description + "This package contains the implementaion details for sqlparser.") + (license license:asl2.0))) + +(define-public rust-sqlparser-derive-0.1 + (package + (inherit rust-sqlparser-derive-0.2) + (name "rust-sqlparser-derive") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "sqlparser_derive" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "07knj4cvqd9r7jb7b6fzdifxipabv34bnzbcw1x7yk1n9b5pbzjm")))) + (arguments + `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)))))) + (define-public rust-st-map-0.1 (package (name "rust-st-map") @@ -64620,6 +73573,26 @@ SPIR-V.") (description "This package provides a runtime for a stack-alocated map.") (license license:expat))) +(define-public rust-stability-0.1 + (package + (name "rust-stability") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "stability" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1kn3vcicmpg8bnyalp15i2j0dbv6c0wc62022bcs58jdi5vv3lgb")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)))) + (home-page "https://github.com/sagebind/stability") + (synopsis "Rust API stability attributes") + (description "Rust API stability attributes for the rest of us.") + (license license:expat))) + (define-public rust-stable-deref-trait-1 (package (name "rust-stable-deref-trait") @@ -64644,6 +73617,27 @@ to the same address.") (license (list license:asl2.0 license:expat)))) +(define-public rust-stable-pattern-0.1 + (package + (name "rust-stable-pattern") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "stable-pattern" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0i8hq82vm82mqj02qqcsd7caibrih7x5w3a1xpm8hpv30261cr25")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; no method named `as_str` found for struct `std::str::Split` + #:cargo-inputs (("rust-memchr" ,rust-memchr-2)))) + (home-page "https://github.com/SergioBenitez/stable-pattern") + (synopsis "Stable port of std::str::Pattern and friends") + (description + "This package provides a stable port of @code{std::str::Pattern} and friends.") + (license (list license:expat license:asl2.0)))) + (define-public rust-stacker-0.1 (package (name "rust-stacker") @@ -64693,8 +73687,32 @@ deeply recursive algorithms that may accidentally blow the stack.") (description "New standard library, old compiler.") (license (list license:expat license:asl2.0)))) +(define-public rust-state-0.6 + (package + (name "rust-state") + (version "0.6.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "state" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1n3n2h324h1y5zhaajh6kplvzfvg1l6hsr8siggmf4yq8m24m31b")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-loom" ,rust-loom-0.5)) + #:cargo-development-inputs + (("rust-static-assertions" ,rust-static-assertions-1)))) + (home-page "https://github.com/SergioBenitez/state") + (synopsis "Library for safe global and thread-local state management") + (description + "This package provides a library for safe global and thread-local state +management.") + (license (list license:expat license:asl2.0)))) + (define-public rust-state-0.5 (package + (inherit rust-state-0.6) (name "rust-state") (version "0.5.3") (source (origin @@ -64704,18 +73722,11 @@ deeply recursive algorithms that may accidentally blow the stack.") (sha256 (base32 "0fzji31ijbkimbzdy4dln9mp5xp7lm1a0dnqxv4n10hywphnds6v")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-loom" ,rust-loom-0.5)) #:cargo-development-inputs - (("rust-static-assertions" ,rust-static-assertions-1)))) - (home-page "https://github.com/SergioBenitez/state") - (synopsis "Library for safe global and thread-local state management") - (description - "This package provides a library for safe global and thread-local state -management.") - (license (list license:expat license:asl2.0)))) + (("rust-static-assertions" ,rust-static-assertions-1)))))) (define-public rust-state-0.4 (package @@ -64794,7 +73805,10 @@ map.") "0wm35q6p6jcq1r1darczv4if7qss460kd391nlw5x3hjpc17kma9")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs + `(#:cargo-test-flags + '("--release" "--" + "--skip=univariate_::test::test_pkurtosis") + #:cargo-inputs (("rust-num" ,rust-num-0.2) ("rust-rand" ,rust-rand-0.6)))) (home-page "https://github.com/JeffBelgum/statistical") @@ -65075,6 +74089,69 @@ UTF-8.") (description "This package provides a static string buffer.") (license license:boost1.0))) +(define-public rust-str-indices-0.4 + (package + (name "rust-str-indices") + (version "0.4.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "str_indices" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0p6kggjax1mx0niq22dsm5xq2jvg6l4nyrm8a6f0138yaav7qmg9")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.3) + ("rust-proptest" ,rust-proptest-1)))) + (home-page "https://github.com/cessen/str_indices") + (synopsis "Count and convert between indexing schemes on string slices") + (description + "Count and convert between indexing schemes on string slices.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-str-stack-0.1 + (package + (name "rust-str-stack") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "str_stack" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1sxl8xd8kiaffsryqpfwcb02lnd3djfin7gf38ag5980908vd4ch")))) + (build-system cargo-build-system) + (home-page "https://github.com/Stebalien/str_stack") + (synopsis "String allocator for allocating many write-once strings") + (description + "This package provides a string allocator for allocating many write-once +strings. This library is primarily useful for parsing where you need to +repeatedly build many strings, use them, and then throw them away. Instead of +allocating many independent strings, this library will put them all in the same +buffer.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-stream-assert-0.1 + (package + (name "rust-stream-assert") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "stream_assert" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "15jbd1wzd1pl7mc7wkhrcnj5km4bv51gng664w23y0f9ff56gavz")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-futures-util" ,rust-futures-util-0.3)))) + (home-page "https://codeberg.org/jplatte/stream_assert") + (synopsis "Macros to simplify testing of `Stream` based APIs") + (description "This package provides macros to simplify testing of +`Stream` based APIs.") + (license license:mpl2.0))) + (define-public rust-streaming-decompression-0.1 (package (name "rust-streaming-decompression") @@ -65102,16 +74179,15 @@ compression and decompression.") (define-public rust-streaming-iterator-0.1 (package (name "rust-streaming-iterator") - (version "0.1.5") + (version "0.1.9") (source (origin (method url-fetch) (uri (crate-uri "streaming-iterator" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1xc1gyq137b020m29g85zdhbbdrksdmhf3dq4ri4fjlrfz0kacih")))) + (base32 "0845zdv8qb7zwqzglpqc0830i43xh3fb6vqms155wz85qfvk28ib")))) (build-system cargo-build-system) - (arguments `(#:skip-build? #t)) (home-page "https://github.com/sfackler/streaming-iterator") (synopsis "Streaming iterators") (description "The iterator APIs in the Rust standard library do not allow @@ -65397,6 +74473,61 @@ file.") #:cargo-inputs (("rust-vte" ,rust-vte-0.10)))))) +(define-public rust-strobe-rs-0.8 + (package + (name "rust-strobe-rs") + (version "0.8.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "strobe-rs" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0bdb9fqjpgck3fzmlsdsq5b14zhm1l66f0xp9x6gmk6c3j527fzs")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) + ("rust-byteorder" ,rust-byteorder-1) + ("rust-keccak" ,rust-keccak-0.1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-big-array" ,rust-serde-big-array-0.4) + ("rust-subtle" ,rust-subtle-2) + ("rust-zeroize" ,rust-zeroize-1)) + #:cargo-development-inputs + (("rust-criterion" ,rust-criterion-0.4) + ("rust-hex" ,rust-hex-0.4) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1)))) + (home-page "https://github.com/rozbb/strobe-rs") + (synopsis "Rust implementation of the Strobe protocol framework") + (description + "This package provides an implementation of the Strobe protocol +framework in pure Rust.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-strobe-rs-0.5 + (package + (inherit rust-strobe-rs-0.8) + (name "rust-strobe-rs") + (version "0.5.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "strobe-rs" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "10s7f7kr5zlza5f5r06wp0ylhyvp904hyw1kagz9r27af7hsx6qs")))) + (arguments + `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) + ("rust-byteorder" ,rust-byteorder-1) + ("rust-subtle" ,rust-subtle-2) + ("rust-tiny-keccak" ,rust-tiny-keccak-2)) + #:cargo-development-inputs + (("rust-hex" ,rust-hex-0.3) + ("rust-serde" ,rust-serde-1) + ("rust-serde-derive" ,rust-serde-derive-1) + ("rust-serde-json" ,rust-serde-json-1)))))) + (define-public rust-strong-xml-0.6 (package (name "rust-strong-xml") @@ -65451,19 +74582,17 @@ file.") "This package provides a strong typed XML parser, based on xmlparser.") (license license:expat))) -(define-public rust-strsim-0.10 +(define-public rust-strsim-0.11 (package (name "rust-strsim") - (version "0.10.0") + (version "0.11.0") (source (origin (method url-fetch) (uri (crate-uri "strsim" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "08s69r4rcrahwnickvi0kq49z524ci50capybln83mg6b473qivk")))) + (base32 "00gsdp2x1gkkxsbjxgrjyil2hsbdg49bwv8q2y1f406dwk4p7q2y")))) (build-system cargo-build-system) (home-page "https://github.com/dguo/strsim-rs") (synopsis "Rust implementations of string similarity metrics") @@ -65472,6 +74601,19 @@ metrics. It includes Hamming, Levenshtein, OSA, Damerau-Levenshtein, Jaro, and Jaro-Winkler.") (license license:expat))) +(define-public rust-strsim-0.10 + (package + (inherit rust-strsim-0.11) + (name "rust-strsim") + (version "0.10.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "strsim" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "08s69r4rcrahwnickvi0kq49z524ci50capybln83mg6b473qivk")))))) + (define-public rust-strsim-0.9 (package (inherit rust-strsim-0.10) @@ -65544,8 +74686,79 @@ and Jaro-Winkler.") (base32 "0z3zzvmilfldp4xw42qbkjf901dcnbk58igrzsvivydjzd24ry37")))))) +(define-public rust-struct-patch-0.4 + (package + (name "rust-struct-patch") + (version "0.4.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "struct-patch" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1hlmncwmq6005znjjk12f5asx4r4m7cfzaxv88i1gcw97r9fylkw")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-struct-patch-derive" ,rust-struct-patch-derive-0.4)) + #:cargo-development-inputs (("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1)))) + (home-page "https://github.com/yanganto/struct-patch/") + (synopsis "Library for partial updates of structs") + (description + "This package provides a library that helps you implement partial updates +for your structs.") + (license license:expat))) + +(define-public rust-struct-patch-derive-0.4 + (package + (name "rust-struct-patch-derive") + (version "0.4.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "struct-patch-derive" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1nsdjvm1xinqx53s520y4fkqshjdfff3r4rglamrzrgb4yf38jpi")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-2)))) + (home-page "https://github.com/yanganto/struct-patch/") + (synopsis "Library for partial updates of structs") + (description + "This package provides a library that helps you implement partial updates +for your structs.") + (license license:expat))) + +(define-public rust-structmeta-0.2 + (package + (name "rust-structmeta") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "structmeta" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0bcj4c2p2j091mn9ld2hbcx77flqjx65ihb9gbb5c12gal4rxbbq")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-structmeta-derive" ,rust-structmeta-derive-0.2) + ("rust-syn" ,rust-syn-2)) + #:cargo-development-inputs (("rust-syn" ,rust-syn-2)))) + (home-page "https://github.com/frozenlib/structmeta") + (synopsis "Parse Rust's attribute arguments by defining a struct.") + (description "This package lets you parse Rust's attribute arguments by +defining a struct.") + (license (list license:expat license:asl2.0)))) + (define-public rust-structmeta-0.1 (package + (inherit rust-structmeta-0.2) (name "rust-structmeta") (version "0.1.6") (source (origin @@ -65555,21 +74768,39 @@ and Jaro-Winkler.") (sha256 (base32 "0alyl12b7fab8izrpliil73sxs1ivr5vm0pisallmxlb4zb44j0h")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) ("rust-quote" ,rust-quote-1) ("rust-structmeta-derive" ,rust-structmeta-derive-0.1) - ("rust-syn" ,rust-syn-1)))) + ("rust-syn" ,rust-syn-1)))))) + +(define-public rust-structmeta-derive-0.2 + (package + (name "rust-structmeta-derive") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "structmeta-derive" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "005ybz4ha874w81pg15n00p01m9hir1dpl8p0352s1wpfgzwl2x6")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-2)) + #:cargo-development-inputs (("rust-syn" ,rust-syn-2)))) (home-page "https://github.com/frozenlib/structmeta") - (synopsis "Parse Rust's attribute arguments by defining a struct.") - (description "This package lets you parse Rust's attribute arguments by -defining a struct.") + (synopsis "Derive macro for structmeta crate") + (description + "This package provides a derive macro for the structmeta crate.") (license (list license:expat license:asl2.0)))) (define-public rust-structmeta-derive-0.1 (package + (inherit rust-structmeta-derive-0.2) (name "rust-structmeta-derive") (version "0.1.6") (source (origin @@ -65579,17 +74810,11 @@ defining a struct.") (sha256 (base32 "14vxik2m3dm7bwx016qfz062fwznkbq02fyq8vby545m0pj0nhi4")))) - (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/frozenlib/structmeta") - (synopsis "Derive macro for structmeta crate") - (description "This package lets you parse Rust's attribute arguments by -defining a struct.") - (license (list license:expat license:asl2.0)))) + ("rust-syn" ,rust-syn-1)))))) (define-public rust-structopt-0.3 (package @@ -65713,25 +74938,26 @@ struct.") "Parse command line argument by defining a struct, derive crate.") (license (list license:asl2.0 license:expat)))) -(define-public rust-strum-0.25 +(define-public rust-strum-0.26 (package (name "rust-strum") - (version "0.25.0") + (version "0.26.1") (source (origin (method url-fetch) (uri (crate-uri "strum" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "09g1q55ms8vax1z0mxlbva3vm8n2r1179kfvbccnkjcidzm58399")))) + (base32 "0przl5xmy1gzf4rlp8ff7wla43slsyk1vlg2xdjsk6nzmpl96fvj")))) (build-system cargo-build-system) (arguments - `(#:tests? #f ; unresolved import `strum::EnumIter` - #:cargo-inputs - (("rust-phf" ,rust-phf-0.10) - ("rust-strum-macros" ,rust-strum-macros-0.25)) - #:cargo-development-inputs - (("rust-strum-macros" ,rust-strum-macros-0.25)))) + `(#:cargo-test-flags '("--release" "--" + "--skip=EnumMessage" + "--skip=EnumProperty" + "--skip=EnumIterator") + #:cargo-inputs (("rust-phf" ,rust-phf-0.10) + ("rust-strum-macros" ,rust-strum-macros-0.26)) + #:cargo-development-inputs (("rust-strum-macros" ,rust-strum-macros-0.26)))) (home-page "https://github.com/Peternator7/strum") (synopsis "Set of traits for working with enums and strings") (description @@ -65739,6 +74965,24 @@ struct.") easier in Rust.") (license license:expat))) +(define-public rust-strum-0.25 + (package + (inherit rust-strum-0.26) + (name "rust-strum") + (version "0.25.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "strum" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "09g1q55ms8vax1z0mxlbva3vm8n2r1179kfvbccnkjcidzm58399")))) + (arguments + `(#:tests? #f ; unresolved import `strum::EnumIter` + #:cargo-inputs (("rust-phf" ,rust-phf-0.10) + ("rust-strum-macros" ,rust-strum-macros-0.25)) + #:cargo-development-inputs (("rust-strum-macros" ,rust-strum-macros-0.25)))))) + (define-public rust-strum-0.24 (package (inherit rust-strum-0.25) @@ -65827,31 +75071,54 @@ easier in Rust.") `(#:cargo-inputs (("rust-strum-macros" ,rust-strum-macros-0.18)))))) -(define-public rust-strum-macros-0.25 +(define-public rust-strum-macros-0.26 (package (name "rust-strum-macros") - (version "0.25.3") + (version "0.26.1") (source (origin (method url-fetch) (uri (crate-uri "strum_macros" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "184y62g474zqb2f7n16x3ghvlyjbh50viw32p9w9l5lwmjlizp13")))) + (base32 "066dsk2f1psyyjllr1yc50251jvpjyh585m0fkcl0rypjgy1fd3s")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs (("rust-heck" ,rust-heck-0.4) + `(#:cargo-test-flags '("--release" "--" + "--skip=enum_discriminants" + "--skip=static_variants_array") + #:cargo-inputs (("rust-heck" ,rust-heck-0.4) ("rust-proc-macro2" ,rust-proc-macro2-1) ("rust-quote" ,rust-quote-1) ("rust-rustversion" ,rust-rustversion-1) ("rust-syn" ,rust-syn-2)) - #:cargo-development-inputs (("rust-strum" ,rust-strum-0.25)))) + #:cargo-development-inputs (("rust-strum" ,rust-strum-0.26)))) (home-page "https://github.com/Peternator7/strum") (synopsis "Set of macros for working with enums and strings") (description "This crate provides helpful macros for working with enums and strings.") (license license:expat))) +(define-public rust-strum-macros-0.25 + (package + (inherit rust-strum-macros-0.26) + (name "rust-strum-macros") + (version "0.25.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "strum_macros" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "184y62g474zqb2f7n16x3ghvlyjbh50viw32p9w9l5lwmjlizp13")))) + (arguments + `(#:cargo-inputs (("rust-heck" ,rust-heck-0.4) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-rustversion" ,rust-rustversion-1) + ("rust-syn" ,rust-syn-2)) + #:cargo-development-inputs (("rust-strum" ,rust-strum-0.25)))))) + (define-public rust-strum-macros-0.24 (package (inherit rust-strum-macros-0.25) @@ -66183,8 +75450,29 @@ values without proliferating generics.") (description "Superluminal Performance C API bindings.") (license (list license:expat license:asl2.0)))) +(define-public rust-supports-color-3 + (package + (name "rust-supports-color") + (version "3.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "supports-color" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0kw5miaai8sarcikzdvsf2ys6rkakngyf2g4yifmgz0xc8ab6acq")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-is-ci" ,rust-is-ci-1)))) + (home-page "https://github.com/zkat/supports-color") + (synopsis "Detects whether a terminal supports color") + (description + "Detects whether a terminal supports color, and gives details about that support.") + (license license:asl2.0))) + (define-public rust-supports-color-2 (package + (inherit rust-supports-color-3) (name "rust-supports-color") (version "2.0.0") (source (origin @@ -66194,20 +75482,49 @@ values without proliferating generics.") (sha256 (base32 "0m5kayz225f23k5jyjin82sfkrqhfdq3j72ianafkazz9cbyfl29")))) - (build-system cargo-build-system) (arguments `(#:tests? #f ; panicked at 'assertion failed: `(left == right)` #:cargo-inputs (("rust-is-terminal" ,rust-is-terminal-0.4) - ("rust-is-ci" ,rust-is-ci-1)))) - (home-page "https://github.com/zkat/supports-color") - (synopsis "Detects whether a terminal supports color") - (description - "Detects whether a terminal supports color, and gives details about that support.") + ("rust-is-ci" ,rust-is-ci-1)))))) + +(define-public rust-supports-color-1 + (package + (inherit rust-supports-color-3) + (name "rust-supports-color") + (version "1.3.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "supports-color" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0vqdhwc3yf1bv1xbaz5d8p2brmlv1ap4fhwg8pfjzr3yrbrgm9lb")))) + (arguments + `(#:tests? #f ; panicked at 'assertion failed: `(left == right)` + #:cargo-inputs (("rust-atty" ,rust-atty-0.2) + ("rust-is-ci" ,rust-is-ci-1)))))) + +(define-public rust-supports-hyperlinks-3 + (package + (name "rust-supports-hyperlinks") + (version "3.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "supports-hyperlinks" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1vh4wjflrpa0vadfirzn57glk1wwrdfxkxwgyqzmy7q4d18iw2ic")))) + (build-system cargo-build-system) + (home-page "https://github.com/zkat/supports-hyperlinks") + (synopsis "Detects whether a terminal supports rendering hyperlinks") + (description "Detects whether a terminal supports rendering hyperlinks.") (license license:asl2.0))) (define-public rust-supports-hyperlinks-2 (package + (inherit rust-supports-hyperlinks-3) (name "rust-supports-hyperlinks") (version "2.1.0") (source @@ -66217,14 +75534,41 @@ values without proliferating generics.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "0g93nh1db3f9lyd0ry35bqjrxkg6sbysn36x9hgd9m5h5rlk2hpq")))) - (build-system cargo-build-system) (arguments - `(#:cargo-inputs (("rust-is-terminal" ,rust-is-terminal-0.4)))) - (home-page "https://github.com/zkat/supports-hyperlinks") - (synopsis "Detects whether a terminal supports rendering hyperlinks") - (description "Detects whether a terminal supports rendering hyperlinks.") + `(#:cargo-inputs (("rust-is-terminal" ,rust-is-terminal-0.4)))))) + +(define-public rust-supports-unicode-3 + (package + (name "rust-supports-unicode") + (version "3.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "supports-unicode" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1qpc344453x3ai4k9iygxnbk6lr2nw5jflj8ns5q3dbcmwq1lh5p")))) + (build-system cargo-build-system) + (home-page "https://github.com/zkat/supports-unicode") + (synopsis "Detects whether a terminal supports unicode") + (description "Detects whether a terminal supports unicode.") (license license:asl2.0))) +(define-public rust-supports-unicode-2 + (package + (inherit rust-supports-unicode-3) + (name "rust-supports-unicode") + (version "2.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "supports-unicode" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0yp703pvpzpmaw9mpncvwf0iqis4xmhs569ii1g20jhqvngc2l7q")))) + (arguments + `(#:cargo-inputs (("rust-is-terminal" ,rust-is-terminal-0.4)))))) + (define-public rust-sval-2 (package (name "rust-sval") @@ -66681,6 +76025,105 @@ executed by swayipc.") sway's IPC interface.") (license license:expat))) +(define-public rust-symbolic-common-12 + (package + (name "rust-symbolic-common") + (version "12.8.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "symbolic-common" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1zhda5h4qykrb38x9yb6s846hpq59mzhglkclb9v4fxvqvxzzk0w")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; unresolved import `symbolic_testutils` + #:cargo-inputs (("rust-debugid" ,rust-debugid-0.8) + ("rust-memmap2" ,rust-memmap2-0.9) + ("rust-serde" ,rust-serde-1) + ("rust-stable-deref-trait" ,rust-stable-deref-trait-1) + ("rust-uuid" ,rust-uuid-1)) + #:cargo-development-inputs (("rust-similar-asserts" ,rust-similar-asserts-1) + ("rust-tempfile" ,rust-tempfile-3)))) + (home-page "https://github.com/getsentry/symbolic") + (synopsis "Common types and utilities for the symbolic library") + (description + "Common types and utilities for symbolic: a library to symbolicate +and process stack traces from native applications, minidumps or minified +@code{JavaScript}.") + (license license:expat))) + +(define-public rust-symbolic-common-9 + (package + (inherit rust-symbolic-common-12) + (name "rust-symbolic-common") + (version "9.2.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "symbolic-common" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1cl2jfm3fd4cqvmc364s1622gg0zp2966z2g9apa428b6fx662c0")))) + (arguments + `(#:tests? #f ; unresolved import `symbolic_testutils` + #:cargo-inputs (("rust-debugid" ,rust-debugid-0.8) + ("rust-memmap2" ,rust-memmap2-0.5) + ("rust-serde" ,rust-serde-1) + ("rust-stable-deref-trait" ,rust-stable-deref-trait-1) + ("rust-uuid" ,rust-uuid-1)) + #:cargo-development-inputs (("rust-similar-asserts" ,rust-similar-asserts-1) + ("rust-tempfile" ,rust-tempfile-3)))))) + +(define-public rust-symbolic-demangle-12 + (package + (name "rust-symbolic-demangle") + (version "12.8.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "symbolic-demangle" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0s0s4af53p9h1xwgz5842wa4qdl7ikq43sy4frzac820v899iabn")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-cc" ,rust-cc-1) + ("rust-cpp-demangle" ,rust-cpp-demangle-0.4) + ("rust-msvc-demangler" ,rust-msvc-demangler-0.9) + ("rust-rustc-demangle" ,rust-rustc-demangle-0.1) + ("rust-symbolic-common" ,rust-symbolic-common-12)) + #:cargo-development-inputs + (("rust-similar-asserts" ,rust-similar-asserts-1)))) + (home-page "https://github.com/getsentry/symbolic") + (synopsis "Library to demangle symbols from various compilers") + (description + "This package provides a library to demangle symbols from various +languages and compilers.") + (license license:expat))) + +(define-public rust-symbolic-demangle-9 + (package + (inherit rust-symbolic-demangle-12) + (name "rust-symbolic-demangle") + (version "9.2.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "symbolic-demangle" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1l0s1lwsrfb8sq1wz4yh8szdncnkdkz4ww9qkqvb6ay7vcghm51b")))) + (arguments + `(#:cargo-inputs (("rust-cc" ,rust-cc-1) + ("rust-cpp-demangle" ,rust-cpp-demangle-0.3) + ("rust-msvc-demangler" ,rust-msvc-demangler-0.9) + ("rust-rustc-demangle" ,rust-rustc-demangle-0.1) + ("rust-symbolic-common" ,rust-symbolic-common-9)) + #:cargo-development-inputs + (("rust-similar-asserts" ,rust-similar-asserts-1)))))) + (define-public rust-symlink-0.1 (package (name "rust-symlink") @@ -67386,14 +76829,14 @@ the absence of concurrency.") (define-public rust-syntect-5 (package (name "rust-syntect") - (version "5.1.0") + (version "5.2.0") (source (origin (method url-fetch) (uri (crate-uri "syntect" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "14cg314vzabi45cdbqgcpav0dlx3d18blp24n3z8pl7q7cq4naz0")))) + (base32 "1ca68wxr8qs99ivqc266492sz8qwfngswizr7hrh8mlrcfiwykc7")))) (build-system cargo-build-system) (arguments `(#:tests? #f ;missing files @@ -67406,18 +76849,23 @@ the absence of concurrency.") ("rust-once-cell" ,rust-once-cell-1) ("rust-onig" ,rust-onig-6) ("rust-plist" ,rust-plist-1) - ("rust-regex-syntax" ,rust-regex-syntax-0.7) + ("rust-regex-syntax" ,rust-regex-syntax-0.8) ("rust-serde" ,rust-serde-1) + ("rust-serde-derive" ,rust-serde-derive-1) ("rust-serde-json" ,rust-serde-json-1) ("rust-thiserror" ,rust-thiserror-1) ("rust-walkdir" ,rust-walkdir-2) ("rust-yaml-rust" ,rust-yaml-rust-0.4)) #:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.3) + ("rust-expect-test" ,rust-expect-test-1) ("rust-getopts" ,rust-getopts-0.2) ("rust-pretty-assertions" ,rust-pretty-assertions-0.6) + ("rust-public-api" ,rust-public-api-0.33) ("rust-rayon" ,rust-rayon-1) - ("rust-regex" ,rust-regex-1)))) + ("rust-regex" ,rust-regex-1) + ("rust-rustdoc-json" ,rust-rustdoc-json-0.8) + ("rust-rustup-toolchain" ,rust-rustup-toolchain-0.1)))) (home-page "https://github.com/trishume/syntect") (synopsis "Library for syntax highlighting and code intelligence") (description @@ -67568,26 +77016,25 @@ intelligence using Sublime Text's grammars.") "This Rust crate gathers system information.") (license license:expat))) -(define-public rust-sys-locale-0.1 +(define-public rust-sys-locale-0.3 (package (name "rust-sys-locale") - (version "0.1.0") + (version "0.3.1") (source (origin (method url-fetch) (uri (crate-uri "sys-locale" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1pv3hl604vnbk7fi5s47zmb555znjj7ddhmgbzvd8c7sb6xrxy4i")))) + (base32 "1c29m5z9bbg4ix5vy25jma83xlakvmkhs9rxy1qwsv6dkqiwy0g8")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-cc" ,rust-cc-1) - ("rust-cstr-core" ,rust-cstr-core-0.2) - ("rust-libc" ,rust-libc-0.2) - ("rust-web-sys" ,rust-web-sys-0.3) - ("rust-winapi" ,rust-winapi-0.3)))) + `(#:cargo-inputs (("rust-js-sys" ,rust-js-sys-0.3) + ("rust-libc" ,rust-libc-0.2) + ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2) + ("rust-web-sys" ,rust-web-sys-0.3)) + #:cargo-development-inputs + (("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3)))) (home-page "https://github.com/1Password/sys-locale") (synopsis "Lightweight library to obtain the active system locale") (description @@ -67596,6 +77043,26 @@ system or application with the relevant platform APIs. The library is also no_std compatible by default, only relying on alloc.") (license (list license:expat license:asl2.0)))) +(define-public rust-sys-locale-0.1 + (package + (inherit rust-sys-locale-0.3) + (name "rust-sys-locale") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "sys-locale" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1pv3hl604vnbk7fi5s47zmb555znjj7ddhmgbzvd8c7sb6xrxy4i")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs (("rust-cc" ,rust-cc-1) + ("rust-cstr-core" ,rust-cstr-core-0.2) + ("rust-libc" ,rust-libc-0.2) + ("rust-web-sys" ,rust-web-sys-0.3) + ("rust-winapi" ,rust-winapi-0.3)))))) + (define-public rust-syscallz-0.17 (package (name "rust-syscallz") @@ -67716,8 +77183,47 @@ information to the kernel using the sysctl interface.") ("rust-errno" ,rust-errno-0.2) ("rust-libc" ,rust-libc-0.2)))))) +(define-public rust-sysinfo-0.30 + (package + (name "rust-sysinfo") + (version "0.30.7") + (source + (origin + (method url-fetch) + (uri (crate-uri "sysinfo" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "064d267hiqnj2jd9rmkki3fra9yjza6gr6i02qm8a2iqxy45hf0c")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-test-flags + (list "--release" "--" + ;; These files aren't available in the build environment. + "--skip=test::check_system_info" + "--skip=test::check_uid_gid" + "--skip=test_networks" + "--skip=test_wait_non_child" + "--skip=test_process_disk_usage") + #:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-1) + ("rust-core-foundation-sys" ,rust-core-foundation-sys-0.8) + ("rust-libc" ,rust-libc-0.2) + ("rust-ntapi" ,rust-ntapi-0.4) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-rayon" ,rust-rayon-1) + ("rust-serde" ,rust-serde-1) + ("rust-windows" ,rust-windows-0.52)) + #:cargo-development-inputs (("rust-serde-json" ,rust-serde-json-1) + ("rust-tempfile" ,rust-tempfile-3)))) + (home-page "https://github.com/GuillaumeGomez/sysinfo") + (synopsis "System handler to interact with processes") + (description + "This package is a library to get system information such as processes, +processors, disks, components and networks.") + (license license:expat))) + (define-public rust-sysinfo-0.28 (package + (inherit rust-sysinfo-0.30) (name "rust-sysinfo") (version "0.28.4") (source @@ -67727,11 +77233,12 @@ information to the kernel using the sysctl interface.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "06zk8awy8gjrk3w68wpkqyprm3j82vq1cibji6db5zlkcv5g7hml")))) - (build-system cargo-build-system) (arguments `(#:cargo-test-flags (list "--release" "--" - ;; These files aren't available in the build environment. + ;; These tests rely on networking, on UIDs and GIDs not + ;; in the build environment, or on unavailable files. + "--skip=test::check_all_process_uids_resolvable" "--skip=test::check_system_info" "--skip=test::check_uid_gid" "--skip=test_networks" @@ -67748,13 +77255,7 @@ information to the kernel using the sysctl interface.") ("rust-winapi" ,rust-winapi-0.3)) #:cargo-development-inputs (("rust-serde-json" ,rust-serde-json-1) - ("rust-tempfile" ,rust-tempfile-3)))) - (home-page "https://github.com/GuillaumeGomez/sysinfo") - (synopsis "System handler to interact with processes") - (description - "This package is a library to get system information such as processes, -processors, disks, components and networks.") - (license license:expat))) + ("rust-tempfile" ,rust-tempfile-3)))))) (define-public rust-sysinfo-0.27 (package @@ -67788,35 +77289,6 @@ processors, disks, components and networks.") #:cargo-development-inputs (("rust-tempfile" ,rust-tempfile-3)))))) -(define-public rust-sysinfo-0.23 - (package - (name "rust-sysinfo") - (version "0.23.0") - (source - (origin - (method url-fetch) - (uri (crate-uri "sysinfo" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 "14d5fgg24x4rfd6226dl1grsv5lnid0kynp6kfzb3lmylh070xcy")))) - (build-system cargo-build-system) - (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-cfg-if" ,rust-cfg-if-1) - ("rust-core-foundation-sys" ,rust-core-foundation-sys-0.8) - ("rust-libc" ,rust-libc-0.2) - ("rust-ntapi" ,rust-ntapi-0.3) - ("rust-once-cell" ,rust-once-cell-1) - ("rust-rayon" ,rust-rayon-1) - ("rust-winapi" ,rust-winapi-0.3)))) - (home-page "https://github.com/GuillaumeGomez/sysinfo") - (synopsis "System handler to interact with processes") - (description - "This package is a library to get system information such as processes, -processors, disks, components and networks.") - (license license:expat))) - (define-public rust-syslog-6 (package (name "rust-syslog") @@ -67979,6 +77451,56 @@ well.") #:cargo-development-inputs (("rust-itertools" ,rust-itertools-0.9)))))) +(define-public rust-tabled-0.14 + (package + (name "rust-tabled") + (version "0.14.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "tabled" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "08jx39f86941n5mklw387j5myriqxng3zmhy2fjsn0d15miw7sfz")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; use of undeclared crate or module `testing_table` + #:cargo-inputs (("rust-ansi-str" ,rust-ansi-str-0.8) + ("rust-ansitok" ,rust-ansitok-0.2) + ("rust-papergrid" ,rust-papergrid-0.10) + ("rust-tabled-derive" ,rust-tabled-derive-0.6) + ("rust-unicode-width" ,rust-unicode-width-0.1)) + #:cargo-development-inputs (("rust-owo-colors" ,rust-owo-colors-3)))) + (home-page "https://github.com/zhiburt/tabled") + (synopsis "Library for pretty print tables of Rust `struct`s and `enum`s") + (description "This package provides a library for pretty print tables of +Rust @code{struct}s and @code{enum}s.") + (license license:expat))) + +(define-public rust-tabled-derive-0.6 + (package + (name "rust-tabled-derive") + (version "0.6.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "tabled_derive" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1r1z7qj37h1x4nyqbxq9jvbd713qvgpjlf1w18pz1x2lifh8ixlr")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-heck" ,rust-heck-0.4) + ("rust-proc-macro-error" ,rust-proc-macro-error-1) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)))) + (home-page "https://github.com/zhiburt/tabled") + (synopsis "Derive macros which is used by tabled crate") + (description + "This package provides derive macros which is used by tabled crate.") + (license license:expat))) + (define-public rust-tabwriter-1 (package (name "rust-tabwriter") @@ -68108,6 +77630,27 @@ memory all at once.") (license (list license:asl2.0 license:expat)))) +(define-public rust-tardar-0.1 + (package + (name "rust-tardar") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "tardar" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "05imkznxr59dqp0s37i7qkrpyjx2zz9lmxy8ijcvka5nhcpr834h")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-miette" ,rust-miette-5) + ("rust-vec1" ,rust-vec1-1)))) + (home-page "https://github.com/olson-sean-k/tardar") + (synopsis "Extensions for diagnostic error handling with `miette`") + (description "This package provides extensione for diagnostic error handling +with `miette`.") + (license license:expat))) + (define-public rust-target-2 (package (name "rust-target") @@ -68129,6 +77672,23 @@ memory all at once.") (description "Get information on compilation target.") (license license:cc0))) +(define-public rust-target-features-0.1 + (package + (name "rust-target-features") + (version "0.1.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "target-features" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1gb974chm9aj8ifkyibylxkyb5an4bf5y8dxb18pqmck698gmdfg")))) + (build-system cargo-build-system) + (home-page "https://github.com/calebzulawski/target-features") + (synopsis "Rust compiler target feature database") + (description "This package contains a Rust compiler target feature database.") + (license (list license:expat license:asl2.0)))) + (define-public rust-target-lexicon-0.12 (package (name "rust-target-lexicon") @@ -68165,17 +77725,17 @@ tools.") (base32 "15gax4765vm2inh45m7cvaf4mgd2mb2mn0i87np0i1d95qhla822")))) (arguments '()))) -(define-public rust-tectonic-bridge-core-0.3 +(define-public rust-tectonic-bridge-core-0.4 (package (name "rust-tectonic-bridge-core") - (version "0.3.2") + (version "0.4.1") (source (origin (method url-fetch) (uri (crate-uri "tectonic_bridge_core" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0zqhyn00wx6qxs4a0m9iy1qmd1451vx2i3b31ng256x7rm0k6dx4")))) + (base32 "1j730zbzi19z45pp995483g1dcax50j4n67aymyhvyscypibv87c")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -68185,7 +77745,7 @@ tools.") ("rust-libc" ,rust-libc-0.2) ("rust-md-5" ,rust-md-5-0.10) ("rust-tectonic-errors" ,rust-tectonic-errors-0.2) - ("rust-tectonic-io-base" ,rust-tectonic-io-base-0.4) + ("rust-tectonic-io-base" ,rust-tectonic-io-base-0.3) ("rust-tectonic-status-base" ,rust-tectonic-status-base-0.2)))) (inputs (list zlib)) (native-inputs (list pkg-config)) @@ -68197,6 +77757,29 @@ I/O services provided by the Tectonic Rust code. This API is then consumed by the various C/C++ ``engines`` implementing the TeX software.") (license license:expat))) +(define-public rust-tectonic-bridge-core-0.3 + (package + (inherit rust-tectonic-bridge-core-0.4) + (name "rust-tectonic-bridge-core") + (version "0.3.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "tectonic_bridge_core" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0zqhyn00wx6qxs4a0m9iy1qmd1451vx2i3b31ng256x7rm0k6dx4")))) + (arguments + `(#:cargo-inputs + (("rust-cc" ,rust-cc-1) + ("rust-flate2" ,rust-flate2-1) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-md-5" ,rust-md-5-0.10) + ("rust-tectonic-errors" ,rust-tectonic-errors-0.2) + ("rust-tectonic-io-base" ,rust-tectonic-io-base-0.4) + ("rust-tectonic-status-base" ,rust-tectonic-status-base-0.2)))))) + (define-public rust-tectonic-bridge-flate-0.1 (package (name "rust-tectonic-bridge-flate") @@ -68278,14 +77861,14 @@ with no Rust bindings.") (define-public rust-tectonic-bridge-harfbuzz-0.2 (package (name "rust-tectonic-bridge-harfbuzz") - (version "0.2.8") + (version "0.2.9") (source (origin (method url-fetch) (uri (crate-uri "tectonic_bridge_harfbuzz" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "18mn8yjrnh2dv7r40ipzj8qzqda09cn3c7dsl7134wv1whn42hvb")) + (base32 "17mj3qks5nv0cc65h7h27j1kz3l5lib0krcai1mwdng72igmrypp")) (snippet #~(begin (use-modules (guix build utils)) (delete-file-recursively "harfbuzz") @@ -68298,8 +77881,7 @@ with no Rust bindings.") `(#:cargo-inputs (("rust-cc" ,rust-cc-1) ("rust-tectonic-bridge-graphite2" ,rust-tectonic-bridge-graphite2-0.2) - ("rust-tectonic-bridge-icu" ,rust-tectonic-bridge-icu-0.2) - ("rust-tectonic-dep-support" ,rust-tectonic-dep-support-0.1)))) + ("rust-tectonic-bridge-icu" ,rust-tectonic-bridge-icu-0.2)))) (inputs (list freetype graphite2 harfbuzz icu4c)) (native-inputs (list pkg-config)) (home-page "https://tectonic-typesetting.github.io/") @@ -68313,14 +77895,14 @@ bindings.") (define-public rust-tectonic-bridge-icu-0.2 (package (name "rust-tectonic-bridge-icu") - (version "0.2.0") + (version "0.2.1") (source (origin (method url-fetch) (uri (crate-uri "tectonic_bridge_icu" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0kbqi4gn26ymjxlg912p1f2v9rb8a39fr3mvpg2j2hm503vh4dj5")))) + (base32 "0zhvqbysn58ja5f4ki7ip6asdqbii45f5l79g90g50q293pfc12d")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -68419,14 +78001,14 @@ process.") (define-public rust-tectonic-docmodel-0.2 (package (name "rust-tectonic-docmodel") - (version "0.2.1") + (version "0.2.2") (source (origin (method url-fetch) (uri (crate-uri "tectonic_docmodel" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "176wl4f1na18s0bjmxf9chw3854jbpkh64nzsm32d2bvgja9acih")))) + (base32 "1dn539wm8lcb34zqwybcwdnhj4yd44adk2wky0frx7s2lr5hfaas")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -68467,8 +78049,43 @@ document model, including the @file{Tectonic.toml} file.") @code{bibtex} program as a reusable crate.") (license license:expat))) +(define-public rust-tectonic-engine-spx2html-0.3 + (package + (name "rust-tectonic-engine-spx2html") + (version "0.3.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "tectonic_engine_spx2html" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1skbxcng0spml3lhb9mmh7sr4nvfvwq715hggxr6pjs3id5p4s5q")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-byteorder" ,rust-byteorder-1) + ("rust-html-escape" ,rust-html-escape-0.2) + ("rust-percent-encoding" ,rust-percent-encoding-2) + ("rust-pinot" ,rust-pinot-0.1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-tectonic-bridge-core" ,rust-tectonic-bridge-core-0.3) + ("rust-tectonic-errors" ,rust-tectonic-errors-0.2) + ("rust-tectonic-io-base" ,rust-tectonic-io-base-0.4) + ("rust-tectonic-status-base" ,rust-tectonic-status-base-0.2) + ("rust-tectonic-xdv" ,rust-tectonic-xdv-0.2) + ("rust-tempfile" ,rust-tempfile-3) + ("rust-tera" ,rust-tera-1)))) + (inputs (list zlib)) + (native-inputs (list pkg-config)) + (home-page "https://tectonic-typesetting.github.io/") + (synopsis "Tectonic engine that converts SPX output to HTML") + (description "This crate implements the Tectonic engine that converts SPX +output to HTML.") + (license license:expat))) + (define-public rust-tectonic-engine-spx2html-0.1 (package + (inherit rust-tectonic-engine-spx2html-0.3) (name "rust-tectonic-engine-spx2html") (version "0.1.1") (source @@ -68478,7 +78095,6 @@ document model, including the @file{Tectonic.toml} file.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "15nxgx20x3ii9ksdj2w9jis1qm1rd451kw3jh87ydvwqnzg88f3m")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-byteorder" ,rust-byteorder-1) @@ -68490,26 +78106,19 @@ document model, including the @file{Tectonic.toml} file.") ("rust-tectonic-status-base" ,rust-tectonic-status-base-0.2) ("rust-tectonic-xdv" ,rust-tectonic-xdv-0.2) ("rust-tempfile" ,rust-tempfile-3) - ("rust-tera" ,rust-tera-1)))) - (inputs (list zlib)) - (native-inputs (list pkg-config)) - (home-page "https://tectonic-typesetting.github.io/") - (synopsis "Tectonic engine that converts SPX output to HTML") - (description "This crate implements the Tectonic engine that converts SPX -output to HTML.") - (license license:expat))) + ("rust-tera" ,rust-tera-1)))))) (define-public rust-tectonic-engine-xetex-0.4 (package (name "rust-tectonic-engine-xetex") - (version "0.4.3") + (version "0.4.4") (source (origin (method url-fetch) (uri (crate-uri "tectonic_engine_xetex" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1hkby5n9hsyzxkgmwzp2xdm0n53f7rp0vs198ns8zgxy5rvl8xv8")))) + (base32 "11if3zyzp8149gf1j4fhwk8kbbs2agxkk5la1lhmq4icrj6szwrf")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -68622,14 +78231,14 @@ interface for fetching URLs using one of several HTTP backends.") (define-public rust-tectonic-io-base-0.4 (package (name "rust-tectonic-io-base") - (version "0.4.2") + (version "0.4.3") (source (origin (method url-fetch) (uri (crate-uri "tectonic_io_base" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0zb04vlg5i082wlv7cfjrkg7yrzd8mhkc7chw15dh26x2z96is18")))) + (base32 "13vqkvxn2r6y827ghj84ndmx991m26sdd4zxpgb7fll00bqwcr6v")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -68751,14 +78360,14 @@ used by XeTeX and Tectonic.") (define-public rust-tectonic-xetex-layout-0.2 (package (name "rust-tectonic-xetex-layout") - (version "0.2.3") + (version "0.2.4") (source (origin (method url-fetch) (uri (crate-uri "tectonic_xetex_layout" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0n7wlmxzcn78gvidrqmc9vbrim1zlwsfj4d7qhpj5fspxpsi24b2")))) + (base32 "0sbh8wnyrkfvzjlzyk3p9zbzp277p1qhmz0davz2sgnzzgp8ffsn")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -68809,6 +78418,21 @@ a C API.") "This Rust library lets you set environment variables temporarily.") (license (list license:expat license:asl2.0)))) +(define-public rust-temp-env-0.2 + (package + (inherit rust-temp-env-0.3) + (name "rust-temp-env") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "temp-env" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0mxbfwcrbzgplf5ixs4n2xsl3pqazna25h2kfjwc9y6xq8v72425")))) + (arguments + `(#:cargo-inputs (("rust-once-cell" ,rust-once-cell-1)))))) + (define-public rust-temp-testdir-0.2 (package (name "rust-temp-testdir") @@ -68856,20 +78480,19 @@ deleting all contents when it's dropped.") (define-public rust-tempfile-3 (package (name "rust-tempfile") - (version "3.9.0") + (version "3.10.1") (source (origin (method url-fetch) (uri (crate-uri "tempfile" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1ypkl7rvv57n16q28psxpb61rnyhmfaif12ascdnsyljm90l3kh1")))) + (base32 "1wdzz35ri168jn9al4s1g2rnsrr5ci91khgarc2rvpb3nappzdw5")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-1) ("rust-fastrand" ,rust-fastrand-2) - ("rust-redox-syscall" ,rust-redox-syscall-0.4) ("rust-rustix" ,rust-rustix-0.38) ("rust-windows-sys" ,rust-windows-sys-0.52)) #:cargo-development-inputs @@ -69172,6 +78795,29 @@ template language.") (("rust-libc" ,rust-libc-0.2) ("rust-winapi" ,rust-winapi-0.3)))))) +(define-public rust-termbg-0.5 + (package + (name "rust-termbg") + (version "0.5.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "termbg" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1pidjkz38z13iz8xchrz1nidxny5zjmxvbl1fs4arilvpzhfc4ic")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-async-std" ,rust-async-std-1) + ("rust-crossterm" ,rust-crossterm-0.27) + ("rust-is-terminal" ,rust-is-terminal-0.4) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-winapi" ,rust-winapi-0.3)))) + (home-page "https://github.com/dalance/termbg") + (synopsis "Terminal background color detection") + (description "This package provides terminal background color detection.") + (license (list license:expat license:asl2.0)))) + (define-public rust-termbox-sys-0.2 (package (name "rust-termbox-sys") @@ -69231,8 +78877,36 @@ writing colored text to a terminal.") #:cargo-inputs (("rust-wincolor" ,rust-wincolor-0.1)))))) +(define-public rust-termimad-0.25 + (package + (name "rust-termimad") + (version "0.25.7") + (source + (origin + (method url-fetch) + (uri (crate-uri "termimad" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1l27mr4pzg44sh150wapc22hq1yzv7fxlm7gj95phz4j5pz91l61")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t ; Cut the dependency graph + #:cargo-inputs (("rust-coolor" ,rust-coolor-0.8) + ("rust-crossbeam" ,rust-crossbeam-0.8) + ("rust-crossterm" ,rust-crossterm-0.23) + ("rust-lazy-regex" ,rust-lazy-regex-3) + ("rust-minimad" ,rust-minimad-0.13) + ("rust-serde" ,rust-serde-1) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-unicode-width" ,rust-unicode-width-0.1)))) + (home-page "https://github.com/Canop/termimad") + (synopsis "Markdown Renderer for the Terminal") + (description "Markdown Renderer for the Terminal.") + (license license:expat))) + (define-public rust-termimad-0.20 (package + (inherit rust-termimad-0.25) (name "rust-termimad") (version "0.20.6") (source (origin @@ -69247,7 +78921,6 @@ writing colored text to a terminal.") '(begin (substitute* "Cargo.toml" (("=([[:digit:]]+\\.[[:digit:]]+\\.[[:digit:]]+)" _ version) (string-append "^" version))))))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t ; Cut the dependency graph #:cargo-inputs @@ -69256,11 +78929,7 @@ writing colored text to a terminal.") ("rust-crossterm" ,rust-crossterm-0.23) ("rust-minimad" ,rust-minimad-0.9) ("rust-thiserror" ,rust-thiserror-1) - ("rust-unicode-width" ,rust-unicode-width-0.1)))) - (home-page "https://github.com/Canop/termimad") - (synopsis "Markdown Renderer for the Terminal") - (description "Markdown Renderer for the Terminal.") - (license license:expat))) + ("rust-unicode-width" ,rust-unicode-width-0.1)))))) (define-public rust-terminal-size-0.3 (package @@ -69320,33 +78989,81 @@ writing colored text to a terminal.") `(("rust-libc" ,rust-libc-0.2) ("rust-winapi" ,rust-winapi-0.3)))))) -(define-public rust-terminfo-0.7 +(define-public rust-terminfo-0.8 (package (name "rust-terminfo") - (version "0.7.3") + (version "0.8.0") (source (origin (method url-fetch) (uri (crate-uri "terminfo" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0zkln56bsixjad6rsfy9mm15d9ygm89i63cn3gn685hjwrvik5vn")))) + (base32 "13s9920jzmnr0jidik8yn6gvkic9n39sl28440mx4x8pd2kd6v36")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-dirs" ,rust-dirs-2) - ("rust-fnv" ,rust-fnv-1) - ("rust-nom" ,rust-nom-5) - ("rust-phf" ,rust-phf-0.8) - ("rust-phf-codegen" ,rust-phf-codegen-0.8)))) + `(#:cargo-test-flags '("--release" "--" + "--skip=Database" + "--skip=expand::expand" + "--skip=src/lib.rs") + #:cargo-inputs (("rust-dirs" ,rust-dirs-4) + ("rust-fnv" ,rust-fnv-1) + ("rust-nom" ,rust-nom-7) + ("rust-phf" ,rust-phf-0.11) + ("rust-phf-codegen" ,rust-phf-codegen-0.11)))) (home-page "https://github.com/meh/rust-terminfo") (synopsis "Terminal information") (description "Terminal capabilities with type-safe getters.") (license license:wtfpl2))) +(define-public rust-terminfo-0.7 + (package + (inherit rust-terminfo-0.8) + (name "rust-terminfo") + (version "0.7.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "terminfo" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0zkln56bsixjad6rsfy9mm15d9ygm89i63cn3gn685hjwrvik5vn")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs (("rust-dirs" ,rust-dirs-2) + ("rust-fnv" ,rust-fnv-1) + ("rust-nom" ,rust-nom-5) + ("rust-phf" ,rust-phf-0.8) + ("rust-phf-codegen" ,rust-phf-codegen-0.8)))))) + +(define-public rust-termion-3 + (package + (name "rust-termion") + (version "3.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "termion" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "19f7q542ih13j13jp5lr750z5yav7v035pmz46zznkahb9ki6y21")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; tests require a terminal + #:cargo-inputs (("rust-libc" ,rust-libc-0.2) + ("rust-libredox" ,rust-libredox-0.0.2) + ("rust-numtoa" ,rust-numtoa-0.1) + ("rust-redox-termios" ,rust-redox-termios-0.1) + ("rust-serde" ,rust-serde-1)))) + (home-page "https://gitlab.redox-os.org/redox-os/termion") + (synopsis "Library for manipulating terminals") + (description + "This package provides a bindless library for manipulating terminals.") + (license license:expat))) + (define-public rust-termion-2 (package + (inherit rust-termion-3) (name "rust-termion") (version "2.0.3") (source (origin @@ -69356,7 +79073,6 @@ writing colored text to a terminal.") (sha256 (base32 "0zcxsj2mms9hv8gizg2x3358ibjynzwvj5w6asr4683gxxyqqr64")))) - (build-system cargo-build-system) (arguments (list #:tests? #f ;tests require a terminal #:cargo-inputs @@ -69364,12 +79080,7 @@ writing colored text to a terminal.") ("rust-libredox" ,rust-libredox-0.0.2) ("rust-numtoa" ,rust-numtoa-0.1) ("rust-redox-termios" ,rust-redox-termios-0.1) - ("rust-serde" ,rust-serde-1)))) - (home-page "https://gitlab.redox-os.org/redox-os/termion") - (synopsis "Library for manipulating terminals") - (description - "This package provides a bindless library for manipulating terminals.") - (license license:expat))) + ("rust-serde" ,rust-serde-1)))))) (define-public rust-termion-1 (package @@ -69395,7 +79106,7 @@ writing colored text to a terminal.") (define-public rust-termios-0.3 (package (name "rust-termios") - (version "0.3.1") + (version "0.3.3") (source (origin (method url-fetch) @@ -69403,7 +79114,7 @@ writing colored text to a terminal.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "09any1p4jp4bphvb5ikagnvwjc3xn2djchy96nkpa782xb2j1dkj")))) + "0sxcs0g00538jqh5xbdqakkzijadr8nj7zmip0c7jz3k83vmn721")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -69434,6 +79145,125 @@ return values to @code{std::io::Result} to indicate success or failure.") (description "Visualize tree-like data on the command-line.") (license license:expat))) +(define-public rust-termwiz-0.22 + (package + (name "rust-termwiz") + (version "0.22.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "termwiz" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1laiwns3l16ilnpxysrm0i6afymrncsj0h1ix8348pfs44z32xas")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-anyhow" ,rust-anyhow-1) + ("rust-base64" ,rust-base64-0.21) + ("rust-bitflags" ,rust-bitflags-2) + ("rust-cassowary" ,rust-cassowary-0.3) + ("rust-colored" ,rust-colored-2) + ("rust-fancy-regex" ,rust-fancy-regex-0.11) + ("rust-filedescriptor" ,rust-filedescriptor-0.8) + ("rust-finl-unicode" ,rust-finl-unicode-1) + ("rust-fixedbitset" ,rust-fixedbitset-0.4) + ("rust-fnv" ,rust-fnv-1) + ("rust-hex" ,rust-hex-0.4) + ("rust-image" ,rust-image-0.24) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-log" ,rust-log-0.4) + ("rust-memmem" ,rust-memmem-0.1) + ("rust-nix" ,rust-nix-0.26) + ("rust-num-derive" ,rust-num-derive-0.3) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-ordered-float" ,rust-ordered-float-4) + ("rust-pest" ,rust-pest-2) + ("rust-pest-derive" ,rust-pest-derive-2) + ("rust-phf" ,rust-phf-0.11) + ("rust-semver" ,rust-semver-0.11) + ("rust-serde" ,rust-serde-1) + ("rust-sha2" ,rust-sha2-0.10) + ("rust-signal-hook" ,rust-signal-hook-0.3) + ("rust-siphasher" ,rust-siphasher-0.3) + ("rust-tempfile" ,rust-tempfile-3) + ("rust-terminfo" ,rust-terminfo-0.8) + ("rust-termios" ,rust-termios-0.3) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-ucd-trie" ,rust-ucd-trie-0.1) + ("rust-unicode-segmentation" ,rust-unicode-segmentation-1) + ("rust-vtparse" ,rust-vtparse-0.6) + ("rust-wezterm-bidi" ,rust-wezterm-bidi-0.2) + ("rust-wezterm-blob-leases" ,rust-wezterm-blob-leases-0.1) + ("rust-wezterm-color-types" ,rust-wezterm-color-types-0.3) + ("rust-wezterm-dynamic" ,rust-wezterm-dynamic-0.2) + ("rust-wezterm-input-types" ,rust-wezterm-input-types-0.1) + ("rust-winapi" ,rust-winapi-0.3)) + #:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.4) + ("rust-env-logger" ,rust-env-logger-0.11) + ("rust-k9" ,rust-k9-0.11) + ("rust-varbincode" ,rust-varbincode-0.1)))) + (home-page "https://github.com/wez/wezterm") + (synopsis "Terminal wizardry") + (description "Terminal Wizardry for Unix and Windows.") + (license license:expat))) + +(define-public rust-termwiz-0.20 + (package + (inherit rust-termwiz-0.22) + (name "rust-termwiz") + (version "0.20.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "termwiz" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1yj80sli95wcw0im2iic9h7mx20hms3f9shxk7jarjqgl5waj2cm")))) + (arguments + `(#:cargo-inputs (("rust-anyhow" ,rust-anyhow-1) + ("rust-base64" ,rust-base64-0.21) + ("rust-bitflags" ,rust-bitflags-1) + ("rust-cassowary" ,rust-cassowary-0.3) + ("rust-colored" ,rust-colored-2) + ("rust-filedescriptor" ,rust-filedescriptor-0.8) + ("rust-finl-unicode" ,rust-finl-unicode-1) + ("rust-fixedbitset" ,rust-fixedbitset-0.4) + ("rust-fnv" ,rust-fnv-1) + ("rust-hex" ,rust-hex-0.4) + ("rust-image" ,rust-image-0.24) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-log" ,rust-log-0.4) + ("rust-memmem" ,rust-memmem-0.1) + ("rust-nix" ,rust-nix-0.24) + ("rust-num-derive" ,rust-num-derive-0.3) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-ordered-float" ,rust-ordered-float-3) + ("rust-pest" ,rust-pest-2) + ("rust-pest-derive" ,rust-pest-derive-2) + ("rust-phf" ,rust-phf-0.10) + ("rust-regex" ,rust-regex-1) + ("rust-semver" ,rust-semver-0.11) + ("rust-serde" ,rust-serde-1) + ("rust-sha2" ,rust-sha2-0.9) + ("rust-signal-hook" ,rust-signal-hook-0.1) + ("rust-siphasher" ,rust-siphasher-0.3) + ("rust-terminfo" ,rust-terminfo-0.7) + ("rust-termios" ,rust-termios-0.3) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-ucd-trie" ,rust-ucd-trie-0.1) + ("rust-unicode-segmentation" ,rust-unicode-segmentation-1) + ("rust-vtparse" ,rust-vtparse-0.6) + ("rust-wezterm-bidi" ,rust-wezterm-bidi-0.2) + ("rust-wezterm-color-types" ,rust-wezterm-color-types-0.2) + ("rust-wezterm-dynamic" ,rust-wezterm-dynamic-0.1) + ("rust-winapi" ,rust-winapi-0.3)) + #:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.3) + ("rust-env-logger" ,rust-env-logger-0.10) + ("rust-k9" ,rust-k9-0.11) + ("rust-varbincode" ,rust-varbincode-0.1)))))) + (define-public rust-test-assembler-0.1 (package (name "rust-test-assembler") @@ -69855,6 +79685,23 @@ unstable language features.") (description "Supports writing tests to verify `log` crate calls.") (license license:bsd-3))) +(define-public rust-text-block-macros-0.1 + (package + (name "rust-text-block-macros") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "text-block-macros" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0ja0p1vz33sakzyxb1n9j6nb9n59g40hzs0xmzg1f5qwvas5k2vz")))) + (build-system cargo-build-system) + (home-page "https://github.com/KSXGitHub/text-block-macros.git") + (synopsis "Create a multiline string literal") + (description "Create a multiline string literal.") + (license license:expat))) + (define-public rust-text-size-1 (package (name "rust-text-size") @@ -69883,6 +79730,28 @@ unstable language features.") (description "This package provides a newtypes for text offsets") (license (list license:expat license:asl2.0)))) +(define-public rust-textnonce-1 + (package + (name "rust-textnonce") + (version "1.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "textnonce" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "10v653sz0305dlzdqh6wh795hxypk24s21iiqcfyv16p1kbzhhvp")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-base64" ,rust-base64-0.12) + ("rust-rand" ,rust-rand-0.7) + ("rust-serde" ,rust-serde-1)) + #:cargo-development-inputs (("rust-bincode" ,rust-bincode-1)))) + (home-page "https://github.com/mikedilger/textnonce") + (synopsis "Text based random nonce generator") + (description "Text based random nonce generator.") + (license (list license:expat license:asl2.0)))) + (define-public rust-textwrap-0.16 (package (name "rust-textwrap") @@ -70001,6 +79870,29 @@ handle Unicode characters correctly.") "An owned slice that packs the slice storage into a single word when possible.") (license license:mpl2.0))) +(define-public rust-thin-vec-0.2 + (package + (name "rust-thin-vec") + (version "0.2.13") + (source + (origin + (method url-fetch) + (uri (crate-uri "thin-vec" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0jsyprh9gjyp2ivnpbfpqmwdcqxfyjj1s9srmfikdhjjh7a91353")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-test-flags '("--release" "--" + "--skip=std_tests::test_set_len_invalid") + #:cargo-inputs (("rust-serde" ,rust-serde-1)) + #:cargo-development-inputs (("rust-serde-test" ,rust-serde-test-1)))) + (home-page "https://github.com/gankra/thin-vec") + (synopsis "Vec that takes up less space on the stack") + (description + "This package provides a vec that takes up less space on the stack.") + (license (list license:expat license:asl2.0)))) + (define-public rust-thiserror-1 (package (name "rust-thiserror") @@ -70094,22 +79986,40 @@ handle Unicode characters correctly.") @code{thiserror} crate.") (license (list license:expat license:asl2.0)))) +(define-public rust-thousands-0.2 + (package + (name "rust-thousands") + (version "0.2.0") + (source (origin + (method url-fetch) + (uri (crate-uri "thousands" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "0848gnkn7ah51lrx15z9zmn701ipn6gc4xbk4kfdlfahkypkpxiv")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t)) + (home-page "https://github.com/tov/thousands-rs") + (synopsis "Adds digit separators to numerals, configurably.") + (description "This package provides thousand separators for numerals.") + (license (list license:expat license:asl2.0)))) + (define-public rust-thread-id-4 (package (name "rust-thread-id") - (version "4.0.0") + (version "4.2.1") (source (origin (method url-fetch) (uri (crate-uri "thread-id" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0zvikdngp0950hi0jgiipr8l36rskk1wk7pc8cd43xr3g5if1psz")))) + (base32 "02xph1955cpsriazs73hnwgjs1fzi8a2zgjplbm0vdcydv283v7h")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2) - ("rust-redox-syscall" ,rust-redox-syscall-0.2) ("rust-winapi" ,rust-winapi-0.3)))) (home-page "https://github.com/ruuda/thread-id") (synopsis "Get a unique ID for the current thread in Rust") @@ -70290,8 +80200,34 @@ fixed set of worker threads.") (license (list license:asl2.0 license:expat)))) +(define-public rust-thrift-0.17 + (package + (name "rust-thrift") + (version "0.17.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "thrift" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "02cydaqqlp25ri19y3ixi77a7nd85fwvbfn4fp0qpakzzj2vqm3y")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-byteorder" ,rust-byteorder-1) + ("rust-integer-encoding" ,rust-integer-encoding-3) + ("rust-log" ,rust-log-0.4) + ("rust-ordered-float" ,rust-ordered-float-2) + ("rust-threadpool" ,rust-threadpool-1)))) + (home-page "https://thrift.apache.org") + (synopsis "Rust bindings for the Apache Thrift RPC system") + (description + "This package provides Rust bindings for the Apache Thrift RPC +system.") + (license license:asl2.0))) + (define-public rust-thrift-0.13 (package + (inherit rust-thrift-0.17) (name "rust-thrift") (version "0.13.0") (source @@ -70301,7 +80237,6 @@ fixed set of worker threads.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "0nvbrflb5fw6hmayqppkp97dh63vs2znww92dlkcfz4laia9cv8c")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs @@ -70309,12 +80244,7 @@ fixed set of worker threads.") ("rust-integer-encoding" ,rust-integer-encoding-1) ("rust-log" ,rust-log-0.4) ("rust-ordered-float" ,rust-ordered-float-1) - ("rust-threadpool" ,rust-threadpool-1)))) - (home-page "https://thrift.apache.org") - (synopsis "Rust bindings for the Apache Thrift RPC system") - (description - "This crate provides Rust bindings for the Apache Thrift RPC system.") - (license license:asl2.0))) + ("rust-threadpool" ,rust-threadpool-1)))))) (define-public rust-tikv-jemalloc-sys-0.4 (package @@ -70409,14 +80339,14 @@ introspection APIs.") (define-public rust-time-0.3 (package (name "rust-time") - (version "0.3.31") + (version "0.3.34") (source (origin (method url-fetch) (uri (crate-uri "time" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0gjqcdsdbh0r5vi4c2vrj5a6prdviapx731wwn07cvpqqd1blmzn")))) + (base32 "0jc7wgprzqjhzd0nqkbmdlnjwyddnswmjw86ni2vq55v45jqn968")))) (build-system cargo-build-system) (arguments `(#:tests? #f ; Not all files included @@ -70425,7 +80355,9 @@ introspection APIs.") ("rust-itoa" ,rust-itoa-1) ("rust-js-sys" ,rust-js-sys-0.3) ("rust-libc" ,rust-libc-0.2) + ("rust-num-conv" ,rust-num-conv-0.1) ("rust-num-threads" ,rust-num-threads-0.1) + ("rust-powerfmt" ,rust-powerfmt-0.2) ("rust-quickcheck" ,rust-quickcheck-1) ("rust-rand" ,rust-rand-0.8) ("rust-serde" ,rust-serde-1) @@ -70433,6 +80365,7 @@ introspection APIs.") ("rust-time-macros" ,rust-time-macros-0.2)) #:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.5) + ("rust-num-conv" ,rust-num-conv-0.1) ("rust-quickcheck-macros" ,rust-quickcheck-macros-1) ("rust-rand" ,rust-rand-0.8) ("rust-rstest" ,rust-rstest-0.18) @@ -70565,17 +80498,18 @@ should not be relied upon directly.") (define-public rust-time-macros-0.2 (package (name "rust-time-macros") - (version "0.2.16") + (version "0.2.17") (source (origin (method url-fetch) (uri (crate-uri "time-macros" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0gx4ngf5g7ydqa8lf7kh9sy72rd4dhvpi31y1jvswi0288rpw696")))) + (base32 "0x3pahhk2751c6kqqq9dk6lz0gydbnxr44q01wpjlrz687ps78vv")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs (("rust-time-core" ,rust-time-core-0.1)))) + `(#:cargo-inputs (("rust-num-conv" ,rust-num-conv-0.1) + ("rust-time-core" ,rust-time-core-0.1)))) (home-page "https://github.com/time-rs/time") (synopsis "Procedural macros for the time crate") (description "This package provides procedural macros for the time @@ -70889,29 +80823,23 @@ C library.") (define-public rust-tinytemplate-1 (package (name "rust-tinytemplate") - (version "1.1.0") + (version "1.2.1") (source (origin (method url-fetch) (uri (crate-uri "tinytemplate" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 - "0by1k1hdz6jgv4ykd0izirwsm6p3qb6s9g1jb4ffqg500ihcfgbd")))) + (base32 "1g5n77cqkdh9hy75zdb01adxn45mkh9y40wdr7l68xpz35gnnkdy")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-serde" ,rust-serde-1) - ("rust-serde-json" ,rust-serde-json-1)) - #:cargo-development-inputs - (("rust-criterion" ,rust-criterion-0.3) - ("rust-serde-derive" ,rust-serde-derive-1)))) + `(#:cargo-inputs (("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1)) + #:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.3) + ("rust-serde-derive" ,rust-serde-derive-1)))) (home-page "https://github.com/bheisler/TinyTemplate") (synopsis "Simple, lightweight template engine") - (description - "Simple, lightweight template engine.") + (description "Simple, lightweight template engine.") (license (list license:asl2.0 license:expat)))) (define-public rust-tinyvec-1 @@ -70943,39 +80871,37 @@ C library.") (define-public rust-tinyvec-macros-0.1 (package (name "rust-tinyvec-macros") - (version "0.1.0") + (version "0.1.1") (source (origin (method url-fetch) (uri (crate-uri "tinyvec_macros" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0p5zvgbas5nh403fbxica819mf3g83n8g2hzpfazfr56w6klv9yd")))) + (base32 "081gag86208sc3y6sdkshgw3vysm5d34p431dzw0bshz66ncng0z")))) (build-system cargo-build-system) - (arguments `(#:skip-build? #t)) (home-page "https://github.com/Soveu/tinyvec_macros") (synopsis "Some macros for tiny containers") (description "This package provides a few useful macros for tiny containers.") (license (list license:expat license:asl2.0 license:zlib)))) -(define-public rust-titlecase-1 +(define-public rust-titlecase-2 (package (name "rust-titlecase") - (version "1.1.0") + (version "2.2.1") (source (origin (method url-fetch) (uri (crate-uri "titlecase" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "05qizspxihjhmzsd9y6kfxzrss4jl4y042wni4m2yk62rw8f8rgm")))) + (base32 "0hi0hkh2x78rvq7rhdgdzsgwcnlpvvb59hgnifsgwz01vf67lf9q")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-lazy-static" ,rust-lazy-static-1) - ("rust-regex" ,rust-regex-1)))) + `(#:cargo-inputs (("rust-joinery" ,rust-joinery-2) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-regex" ,rust-regex-1)))) (home-page "https://github.com/wezm/titlecase") (synopsis "Tool and Rust crate for transforming text into title case") (description @@ -70984,6 +80910,23 @@ to a style defined by John Gruber for post titles on his website ``Daring Fireball''.") (license license:expat))) +(define-public rust-titlecase-1 + (package + (inherit rust-titlecase-2) + (name "rust-titlecase") + (version "1.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "titlecase" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "05qizspxihjhmzsd9y6kfxzrss4jl4y042wni4m2yk62rw8f8rgm")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs (("rust-lazy-static" ,rust-lazy-static-1) + ("rust-regex" ,rust-regex-1)))))) + (define-public rust-to-shmem-0.0.0 (package (name "rust-to-shmem") @@ -71066,14 +81009,14 @@ tinyobjloader.") (define-public rust-tokio-1 (package (name "rust-tokio") - (version "1.35.1") + (version "1.36.0") (source (origin (method url-fetch) (uri (crate-uri "tokio" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "01613rkziqp812a288ga65aqygs254wgajdi57v8brivjkx4x6y8")))) + (base32 "0c89p36zbd4abr1z3l5mipp43x7z4c9b4vp4s6r8y0gs2mjmya31")))) (build-system cargo-build-system) (arguments (list #:tests? #f ; unresolved imports `crate::runtime::task` @@ -71095,7 +81038,7 @@ tinyobjloader.") ("rust-futures" ,rust-futures-0.3) ("rust-libc" ,rust-libc-0.2) ("rust-loom" ,rust-loom-0.7) - ("rust-mio-aio" ,rust-mio-aio-0.7) + ("rust-mio-aio" ,rust-mio-aio-0.8) ("rust-mockall" ,rust-mockall-0.11) ("rust-nix" ,rust-nix-0.27) ("rust-rand" ,rust-rand-0.8) @@ -71634,6 +81577,36 @@ operations.") #:cargo-development-inputs (("rust-tokio" ,rust-tokio-0.2)))))) +(define-public rust-tokio-metrics-0.3 + (package + (name "rust-tokio-metrics") + (version "0.3.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "tokio-metrics" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "04p1kf7sgcrs2n62331fm5yvv8scqv2x81qixdz8pjb23lj0kkpa")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; unresolved import `tokio_metrics::RuntimeMonitor` + #:cargo-inputs (("rust-futures-util" ,rust-futures-util-0.3) + ("rust-pin-project-lite" ,rust-pin-project-lite-0.2) + ("rust-tokio" ,rust-tokio-1) + ("rust-tokio-stream" ,rust-tokio-stream-0.1)) + #:cargo-development-inputs (("rust-axum" ,rust-axum-0.6) + ("rust-criterion" ,rust-criterion-0.3) + ("rust-futures" ,rust-futures-0.3) + ("rust-num-cpus" ,rust-num-cpus-1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-tokio" ,rust-tokio-1)))) + (home-page "https://tokio.rs") + (synopsis "Runtime and task level metrics for Tokio applications") + (description "Runtime and task level metrics for Tokio applications.") + (license license:expat))) + (define-public rust-tokio-mock-task-0.1 (package (name "rust-tokio-mock-task") @@ -72569,29 +82542,30 @@ implementation of TLS for nonblocking I/O streams.") ("rust-security-framework" ,rust-security-framework-0.2) ("rust-tokio" ,rust-tokio-0.1)))))) -(define-public rust-tokio-tungstenite-0.20 +(define-public rust-tokio-tungstenite-0.21 (package (name "rust-tokio-tungstenite") - (version "0.20.1") + (version "0.21.0") (source (origin (method url-fetch) (uri (crate-uri "tokio-tungstenite" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0v1v24l27hxi5hlchs7hfd5rgzi167x0ygbw220nvq0w5b5msb91")))) + (base32 "0f5wj0crsx74rlll97lhw0wk6y12nhdnqvmnjx002hjn08fmcfy8")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-futures-util" ,rust-futures-util-0.3) ("rust-log" ,rust-log-0.4) ("rust-native-tls" ,rust-native-tls-0.2) - ("rust-rustls" ,rust-rustls-0.21) - ("rust-rustls-native-certs" ,rust-rustls-native-certs-0.6) + ("rust-rustls" ,rust-rustls-0.22) + ("rust-rustls-native-certs" ,rust-rustls-native-certs-0.7) + ("rust-rustls-pki-types" ,rust-rustls-pki-types-1) ("rust-tokio" ,rust-tokio-1) ("rust-tokio-native-tls" ,rust-tokio-native-tls-0.3) - ("rust-tokio-rustls" ,rust-tokio-rustls-0.24) - ("rust-tungstenite" ,rust-tungstenite-0.20) - ("rust-webpki-roots" ,rust-webpki-roots-0.25)) + ("rust-tokio-rustls" ,rust-tokio-rustls-0.25) + ("rust-tungstenite" ,rust-tungstenite-0.21) + ("rust-webpki-roots" ,rust-webpki-roots-0.26)) #:cargo-development-inputs (("rust-env-logger" ,rust-env-logger-0.10) ("rust-futures-channel" ,rust-futures-channel-0.3) ("rust-hyper" ,rust-hyper-0.14) @@ -72604,6 +82578,35 @@ implementation of TLS for nonblocking I/O streams.") stream-based @code{WebSocket} implementation.") (license license:expat))) +(define-public rust-tokio-tungstenite-0.20 + (package + (inherit rust-tokio-tungstenite-0.21) + (name "rust-tokio-tungstenite") + (version "0.20.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "tokio-tungstenite" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0v1v24l27hxi5hlchs7hfd5rgzi167x0ygbw220nvq0w5b5msb91")))) + (arguments + `(#:cargo-inputs (("rust-futures-util" ,rust-futures-util-0.3) + ("rust-log" ,rust-log-0.4) + ("rust-native-tls" ,rust-native-tls-0.2) + ("rust-rustls" ,rust-rustls-0.21) + ("rust-rustls-native-certs" ,rust-rustls-native-certs-0.6) + ("rust-tokio" ,rust-tokio-1) + ("rust-tokio-native-tls" ,rust-tokio-native-tls-0.3) + ("rust-tokio-rustls" ,rust-tokio-rustls-0.24) + ("rust-tungstenite" ,rust-tungstenite-0.20) + ("rust-webpki-roots" ,rust-webpki-roots-0.25)) + #:cargo-development-inputs (("rust-env-logger" ,rust-env-logger-0.10) + ("rust-futures-channel" ,rust-futures-channel-0.3) + ("rust-hyper" ,rust-hyper-0.14) + ("rust-tokio" ,rust-tokio-1) + ("rust-url" ,rust-url-2)))))) + (define-public rust-tokio-tungstenite-0.19 (package (inherit rust-tokio-tungstenite-0.20) @@ -72635,6 +82638,35 @@ stream-based @code{WebSocket} implementation.") ("rust-tokio" ,rust-tokio-1) ("rust-url" ,rust-url-2)))))) +(define-public rust-tokio-tungstenite-0.16 + (package + (inherit rust-tokio-tungstenite-0.21) + (name "rust-tokio-tungstenite") + (version "0.16.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "tokio-tungstenite" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0wnadcv9q2yi7bjkdp6z0g4rk7kbdblsv613fpgjrhgwdbgkj2z8")))) + (arguments + `(#:cargo-inputs (("rust-futures-util" ,rust-futures-util-0.3) + ("rust-log" ,rust-log-0.4) + ("rust-native-tls" ,rust-native-tls-0.2) + ("rust-rustls" ,rust-rustls-0.20) + ("rust-rustls-native-certs" ,rust-rustls-native-certs-0.6) + ("rust-tokio" ,rust-tokio-1) + ("rust-tokio-native-tls" ,rust-tokio-native-tls-0.3) + ("rust-tokio-rustls" ,rust-tokio-rustls-0.23) + ("rust-tungstenite" ,rust-tungstenite-0.16) + ("rust-webpki" ,rust-webpki-0.22) + ("rust-webpki-roots" ,rust-webpki-roots-0.22)) + #:cargo-development-inputs (("rust-env-logger" ,rust-env-logger-0.7) + ("rust-futures-channel" ,rust-futures-channel-0.3) + ("rust-tokio" ,rust-tokio-1) + ("rust-url" ,rust-url-2)))))) + (define-public rust-tokio-tungstenite-0.11 (package (name "rust-tokio-tungstenite") @@ -72967,21 +82999,21 @@ stream-based WebSocket implementation.") (define-public rust-toml-0.8 (package (name "rust-toml") - (version "0.8.8") + (version "0.8.12") (source (origin (method url-fetch) (uri (crate-uri "toml" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0ddbahcrrxf9374mkn3c1h2a2g6a883qx23kywl6k8lxikn9b8d1")))) + (base32 "18rs8cbzmapwcxf0lpdwz84fmsgp9h5vv6xay5d4m2r0x12ibpg9")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-indexmap" ,rust-indexmap-2) ("rust-serde" ,rust-serde-1) ("rust-serde-spanned" ,rust-serde-spanned-0.6) ("rust-toml-datetime" ,rust-toml-datetime-0.6) - ("rust-toml-edit" ,rust-toml-edit-0.21)) + ("rust-toml-edit" ,rust-toml-edit-0.22)) #:cargo-development-inputs (("rust-serde" ,rust-serde-1) ("rust-serde-json" ,rust-serde-json-1) @@ -73153,17 +83185,17 @@ serializing Rust structures.") (arguments `(#:cargo-inputs (("rust-serde" ,rust-serde-1)))))) -(define-public rust-toml-edit-0.21 +(define-public rust-toml-edit-0.22 (package (name "rust-toml-edit") - (version "0.21.0") + (version "0.22.9") (source (origin (method url-fetch) (uri (crate-uri "toml_edit" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "00xa3qfk34qazvnkfxyyyqqc6nyl2ksks1c5bd53n5has0y3hkfk")))) + (base32 "1i3lhd5krd4ah3mgn4m73yla01l7rdlfpl5asy7jb1sikivvnh4f")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-indexmap" ,rust-indexmap-2) @@ -73171,9 +83203,9 @@ serializing Rust structures.") ("rust-serde" ,rust-serde-1) ("rust-serde-spanned" ,rust-serde-spanned-0.6) ("rust-toml-datetime" ,rust-toml-datetime-0.6) - ("rust-winnow" ,rust-winnow-0.5)) + ("rust-winnow" ,rust-winnow-0.6)) #:cargo-development-inputs - (("rust-libtest-mimic" ,rust-libtest-mimic-0.6) + (("rust-libtest-mimic" ,rust-libtest-mimic-0.7) ("rust-serde-json" ,rust-serde-json-1) ("rust-snapbox" ,rust-snapbox-0.4) ("rust-toml-test-data" ,rust-toml-test-data-1) @@ -73184,6 +83216,32 @@ serializing Rust structures.") parser.") (license (list license:expat license:asl2.0)))) +(define-public rust-toml-edit-0.21 + (package + (inherit rust-toml-edit-0.22) + (name "rust-toml-edit") + (version "0.21.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "toml_edit" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1qch02syrd9c8krcimfl72gyjz11fmjssh03hrg41dbqgzyk91ba")))) + (arguments + `(#:cargo-inputs (("rust-indexmap" ,rust-indexmap-2) + ("rust-kstring" ,rust-kstring-2) + ("rust-serde" ,rust-serde-1) + ("rust-serde-spanned" ,rust-serde-spanned-0.6) + ("rust-toml-datetime" ,rust-toml-datetime-0.6) + ("rust-winnow" ,rust-winnow-0.5)) + #:cargo-development-inputs + (("rust-libtest-mimic" ,rust-libtest-mimic-0.6) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-snapbox" ,rust-snapbox-0.4) + ("rust-toml-test-data" ,rust-toml-test-data-1) + ("rust-toml-test-harness" ,rust-toml-test-harness-0.4)))))) + (define-public rust-toml-edit-0.20 (package (inherit rust-toml-edit-0.21) @@ -73363,13 +83421,13 @@ parser.") (define-public rust-toml-test-data-1 (package (name "rust-toml-test-data") - (version "1.4.0") + (version "1.8.0") (source (origin (method url-fetch) (uri (crate-uri "toml-test-data" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0bgdwyjsqgpwwi5s1w483a1g3qrwmq0l3742k07575qzcc6sx0h0")))) + (base32 "0pf13igrg0rm5fmy1sj57y9m313wyfwwjrqxgp3fhg41kvcvmdf6")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-include-dir" ,rust-include-dir-0.7)))) @@ -73979,8 +84037,44 @@ be used directly. See @code{rust-trackable} for more information.") (license (list license:asl2.0 license:expat)))) +(define-public rust-trash-3 + (package + (name "rust-trash") + (version "3.3.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "trash" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0mssqp3qyv2jwihkkmc5zga51bbrhn6xikdmld9s3mfr8s6lan66")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-chrono" ,rust-chrono-0.4) + ("rust-libc" ,rust-libc-0.2) + ("rust-log" ,rust-log-0.4) + ("rust-objc" ,rust-objc-0.2) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-scopeguard" ,rust-scopeguard-1) + ("rust-url" ,rust-url-2) + ("rust-windows" ,rust-windows-0.44)) + #:cargo-development-inputs (("rust-chrono" ,rust-chrono-0.4) + ("rust-env-logger" ,rust-env-logger-0.10) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-rand" ,rust-rand-0.8) + ("rust-serial-test" ,rust-serial-test-2) + ("rust-tempfile" ,rust-tempfile-3)))) + (home-page "https://github.com/ArturKovacs/trash") + (synopsis "Library for moving files and folders to the recycle bin") + (description + "This package provides a library for moving files and folders to the +recycle bin.") + (license license:expat))) + (define-public rust-trash-2 (package + (inherit rust-trash-3) (name "rust-trash") (version "2.1.5") (source @@ -73991,7 +84085,6 @@ be used directly. See @code{rust-trackable} for more information.") (sha256 (base32 "0djjjvvpxhx4li3y0jp1q48xabvazzif8g7z6110rm4chikh62gy")) (patches (search-patches "rust-trash-2-update-windows.patch")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-chrono" ,rust-chrono-0.4) @@ -74007,13 +84100,7 @@ be used directly. See @code{rust-trackable} for more information.") ("rust-env-logger" ,rust-env-logger-0.9) ("rust-once-cell" ,rust-once-cell-1) ("rust-rand" ,rust-rand-0.8) - ("rust-serial-test" ,rust-serial-test-0.6)))) - (home-page "https://github.com/ArturKovacs/trash-rs") - (synopsis "Library for moving files and folders to the recycle bin") - (description - "This package provides a library for moving files and folders to the -recycle bin.") - (license license:expat))) + ("rust-serial-test" ,rust-serial-test-0.6)))))) (define-public rust-tree-magic-db-3 (package @@ -74196,25 +84283,25 @@ etc. distance calculations and string search.") (define-public rust-trybuild-1 (package (name "rust-trybuild") - (version "1.0.89") + (version "1.0.91") (source (origin (method url-fetch) (uri (crate-uri "trybuild" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "13s8pchqdkwr4zby1y5hamw0p8aywwczc0r3fbb86d4icak3p7cs")))) + (base32 "0nkxwbgpvpkkbxwkd40vv0yvfm5wjddgiwdc7p5fpbgb35iypmwa")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-basic-toml" ,rust-basic-toml-0.1) - ("rust-dissimilar" ,rust-dissimilar-1) + (("rust-dissimilar" ,rust-dissimilar-1) ("rust-glob" ,rust-glob-0.3) ("rust-once-cell" ,rust-once-cell-1) ("rust-serde" ,rust-serde-1) ("rust-serde-derive" ,rust-serde-derive-1) ("rust-serde-json" ,rust-serde-json-1) - ("rust-termcolor" ,rust-termcolor-1)) + ("rust-termcolor" ,rust-termcolor-1) + ("rust-toml" ,rust-toml-0.8)) #:cargo-development-inputs (("rust-automod" ,rust-automod-1)))) (home-page "https://github.com/dtolnay/trybuild") (synopsis "Test harness for ui tests of compiler diagnostics") @@ -74252,8 +84339,41 @@ etc. distance calculations and string search.") (with support for inline tests).") (license (list license:expat license:asl2.0)))) +(define-public rust-trycmd-0.15 + (package + (name "rust-trycmd") + (version "0.15.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "trycmd" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "05sklyyprn2a365jzby0zn7z97p6mpgi2yzlr2s506m80cvdnkj6")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-anstream" ,rust-anstream-0.6) + ("rust-escargot" ,rust-escargot-0.5) + ("rust-glob" ,rust-glob-0.3) + ("rust-humantime" ,rust-humantime-2) + ("rust-humantime-serde" ,rust-humantime-serde-1) + ("rust-rayon" ,rust-rayon-1) + ("rust-schemars" ,rust-schemars-0.8) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-shlex" ,rust-shlex-1) + ("rust-snapbox" ,rust-snapbox-0.5) + ("rust-toml-edit" ,rust-toml-edit-0.22)))) + (home-page "https://github.com/assert-rs/trycmd") + (synopsis "Snapshot testing for a herd of CLI tests") + (description "trycmd is a test harness that will enumerate test case files +and run them to verify the results, taking inspiration from @code{trybuild} and +@code{cram}.") + (license (list license:expat license:asl2.0)))) + (define-public rust-trycmd-0.14 (package + (inherit rust-trycmd-0.15) (name "rust-trycmd") (version "0.14.19") (source (origin @@ -74262,7 +84382,6 @@ etc. distance calculations and string search.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "1yz4prkmnb1y406p0aq3r8yf11alj8i94yvnz3k07c9glir9607d")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-anstream" ,rust-anstream-0.6) @@ -74276,13 +84395,7 @@ etc. distance calculations and string search.") ("rust-serde-json" ,rust-serde-json-1) ("rust-shlex" ,rust-shlex-1) ("rust-snapbox" ,rust-snapbox-0.4) - ("rust-toml-edit" ,rust-toml-edit-0.20)))) - (home-page "https://github.com/assert-rs/trycmd") - (synopsis "Snapshot testing for a herd of CLI tests") - (description "trycmd is a test harness that will enumerate test case files -and run them to verify the results, taking inspiration from @code{trybuild} and -@code{cram}.") - (license (list license:expat license:asl2.0)))) + ("rust-toml-edit" ,rust-toml-edit-0.20)))))) (define-public rust-trycmd-0.13 (package @@ -74376,6 +84489,22 @@ and run them to verify the results, taking inspiration from @code{trybuild} and parser.") (license (list license:expat license:asl2.0)))) +(define-public rust-ttf-parser-0.17 + (package + (inherit rust-ttf-parser-0.19) + (name "rust-ttf-parser") + (version "0.17.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "ttf-parser" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1zrbcjmyz3280wlbdbxskz0gd25lxizjzkcmq50xzdns8kx14n1p")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t)))) ; Cut the dependency graph. + (define-public rust-ttf-parser-0.12 (package (inherit rust-ttf-parser-0.19) @@ -74494,8 +84623,33 @@ or dashboards.") #:cargo-development-inputs (("rust-argh" ,rust-argh-0.1) ("rust-rand" ,rust-rand-0.8)))))) +(define-public rust-tui-react-0.22 + (package + (name "rust-tui-react") + (version "0.22.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "tui-react" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "04b5av7fpg46bz3zbgqxdwkrx42lcfcap1afxhd6qrnlw9rwvyig")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-log" ,rust-log-0.4) + ("rust-ratatui" ,rust-ratatui-0.25) + ("rust-unicode-segmentation" ,rust-unicode-segmentation-1) + ("rust-unicode-width" ,rust-unicode-width-0.1)))) + (home-page "https://github.com/Byron/tui-crates") + (synopsis "TUI widgets using a react-like paradigm") + (description + "TUI widgets using a react-like paradigm, allowing mutable component state and +render properties.") + (license license:expat))) + (define-public rust-tui-react-0.20 (package + (inherit rust-tui-react-0.22) (name "rust-tui-react") (version "0.20.0") (source @@ -74505,18 +84659,40 @@ or dashboards.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "19zr81rz3i7ckp0f0jmz7r8iv5jcj0a1g71zpkr2n46svxz3mw8i")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-log" ,rust-log-0.4) ("rust-ratatui" ,rust-ratatui-0.20) ("rust-unicode-segmentation" ,rust-unicode-segmentation-1) - ("rust-unicode-width" ,rust-unicode-width-0.1)))) - (home-page "https://github.com/Byron/tui-crates") - (synopsis "TUI widgets using a react-like paradigm") + ("rust-unicode-width" ,rust-unicode-width-0.1)))))) + +(define-public rust-tui-textarea-0.4 + (package + (name "rust-tui-textarea") + (version "0.4.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "tui-textarea" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "13mxwxqq6r6kplszs2r2qlnc8hw4hpk2zgrzjby9q6ll3znqrqx3")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-arbitrary" ,rust-arbitrary-1) + ("rust-crossterm" ,rust-crossterm-0.25) + ("rust-crossterm" ,rust-crossterm-0.27) + ("rust-ratatui" ,rust-ratatui-0.24) + ("rust-regex" ,rust-regex-1) + ("rust-termion" ,rust-termion-2) + ("rust-termwiz" ,rust-termwiz-0.20) + ("rust-tui" ,rust-tui-0.19) + ("rust-unicode-width" ,rust-unicode-width-0.1)))) + (home-page "https://github.com/rhysd/tui-textarea") + (synopsis "Text editor widget for ratatui and tui-rs") (description - "TUI widgets using a react-like paradigm, allowing mutable component state and -render properties.") + "Tui-textarea is a text editor widget for ratatui and tui-rs. This +multi-line text editor can be easily put as part of your TUI application.") (license license:expat))) (define-public rust-tuikit-0.5 @@ -74604,6 +84780,35 @@ render properties.") #:cargo-development-inputs (("rust-env-logger" ,rust-env-logger-0.6)))))) +(define-public rust-tun-tap-0.1 + (package + (name "rust-tun-tap") + (version "0.1.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "tun-tap" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0l5yp9xs5kyhzrkqfhnqjwj97ylzr5xd0g6jfp42miv7jd77liws")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-test-flags '("--release" "--" + "--skip=it_receives_packets" + "--skip=it_sents_packets") + #:cargo-inputs (("rust-cc" ,rust-cc-1) + ("rust-futures" ,rust-futures-0.1) + ("rust-libc" ,rust-libc-0.2) + ("rust-mio" ,rust-mio-0.6) + ("rust-tokio-core" ,rust-tokio-core-0.1)) + #:cargo-development-inputs (("rust-etherparse" ,rust-etherparse-0.9) + ("rust-serial-test" ,rust-serial-test-0.4) + ("rust-version-sync" ,rust-version-sync-0.9)))) + (home-page "https://github.com/vorner/tuntap") + (synopsis "TUN/TAP interface wrapper") + (description "This package provides a TUN/TAP interface wrapper.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-twoway-0.2 (package (name "rust-twoway") @@ -74644,6 +84849,35 @@ strings.") (base32 "1lbf64snscr3vz71jbl6i2c8zr2ndsiqbk6316z39fj1a8mipcar")))))) +(define-public rust-twox-hash-1 + (package + (name "rust-twox-hash") + (version "1.6.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "twox-hash" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0xgn72j36a270l5ls1jk88n7bmq2dhlfkbhdh5554hbagjsydzlp")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-cfg-if" ,rust-cfg-if-0.1) + ("rust-digest" ,rust-digest-0.8) + ("rust-digest" ,rust-digest-0.9) + ("rust-digest" ,rust-digest-0.10) + ("rust-rand" ,rust-rand-0.8) + ("rust-serde" ,rust-serde-1) + ("rust-static-assertions" ,rust-static-assertions-1)) + #:cargo-development-inputs + (("rust-serde-json" ,rust-serde-json-1)))) + (home-page "https://github.com/shepmaster/twox-hash") + (synopsis "Rust implementation of the XXHash and XXH3 algorithms") + (description "This package provides a Rust implementation of the XXHash +and XXH3 algorithms.") + (license license:expat))) + (define-public rust-typeable-0.1 (package (name "rust-typeable") @@ -74665,7 +84899,7 @@ strings.") (define-public rust-typed-arena-2 (package (name "rust-typed-arena") - (version "2.0.1") + (version "2.0.2") (source (origin (method url-fetch) @@ -74674,7 +84908,7 @@ strings.") (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1bnhphrksp9krxhsfhfimrxvkbah2pa6rf9ygmpw5lalbm6wi186")))) + "0shj0jpmglhgw2f1i4b33ycdzwd1z205pbs1rd5wx7ks2qhaxxka")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t)) (home-page "https://github.com/SimonSapin/rust-typed-arena") @@ -74720,6 +84954,22 @@ strings.") "This package provides compile-time type-checked builder derive.") (license (list license:expat license:asl2.0)))) +(define-public rust-typed-builder-0.16 + (package + (inherit rust-typed-builder-0.18) + (name "rust-typed-builder") + (version "0.16.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "typed-builder" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "05ny1brm9ff3hxrps3n328w28myk4lz0h24jhxx64dhyjhbmq21l")))) + (arguments + `(#:cargo-inputs + (("rust-typed-builder-macro" ,rust-typed-builder-macro-0.16)))))) + (define-public rust-typed-builder-0.5 (package (inherit rust-typed-builder-0.18) @@ -74760,6 +85010,23 @@ strings.") (description "Compile-time type-checked builder derive.") (license (list license:expat license:asl2.0)))) +(define-public rust-typed-builder-macro-0.16 + (package + (inherit rust-typed-builder-macro-0.18) + (name "rust-typed-builder-macro") + (version "0.16.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "typed-builder-macro" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0vp94vzcnrqlz93swkai13w9dmklpdh2c2800zpjnvi0735s8g7h")))) + (arguments + `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-2)))))) + (define-public rust-typemap-0.3 (package (name "rust-typemap") @@ -74806,6 +85073,163 @@ implementation is incomplete.") (license (list license:asl2.0 license:expat)))) +(define-public rust-typetag-0.2 + (package + (name "rust-typetag") + (version "0.2.16") + (source + (origin + (method url-fetch) + (uri (crate-uri "typetag" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1bwswa9ah2sc6fmlfw2pim73rr1n6vhfwmidrsga8cn09r0ih7b6")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-erased-serde" ,rust-erased-serde-0.4) + ("rust-inventory" ,rust-inventory-0.3) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-serde" ,rust-serde-1) + ("rust-typetag-impl" ,rust-typetag-impl-0.2)) + #:cargo-development-inputs (("rust-postcard" ,rust-postcard-1) + ("rust-rustversion" ,rust-rustversion-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-trybuild" ,rust-trybuild-1)))) + (home-page "https://github.com/dtolnay/typetag") + (synopsis "Serde serializable and deserializable trait objects") + (description + "This package provides serde serializable and deserializable trait objects.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-typetag-impl-0.2 + (package + (name "rust-typetag-impl") + (version "0.2.16") + (source + (origin + (method url-fetch) + (uri (crate-uri "typetag-impl" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1cabnvm526bcgh1sh34js5ils0gz4xwlgvwhm992acdr8xzqhwxc")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-2)))) + (home-page "https://github.com/dtolnay/typetag") + (synopsis "Implementation detail of the typetag crate") + (description + "This package provides the implementation detail of the typetag crate.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-typewit-1 + (package + (name "rust-typewit") + (version "1.9.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "typewit" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "093fgb1q5n48vr4nj3hggbhfi6jzab5048scs6jz1ynalgk9myy6")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-typewit-proc-macros" ,rust-typewit-proc-macros-1)) + #:cargo-development-inputs (("rust-arrayvec" ,rust-arrayvec-0.7) + ("rust-trybuild" ,rust-trybuild-1)))) + (home-page "https://github.com/rodrimati1992/typewit/") + (synopsis "Type-witness-based abstractions") + (description "This package provides type-witness-based abstractions, mostly +for emulating polymorphism in const fns.") + (license license:zlib))) + +(define-public rust-typewit-proc-macros-1 + (package + (name "rust-typewit-proc-macros") + (version "1.8.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "typewit_proc_macros" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1mlkh4mhbn4b7xg9640blk74bm5ddaa44ihvl0sljw1w5gm86sp3")))) + (build-system cargo-build-system) + (home-page "https://github.com/rodrimati1992/typewit/") + (synopsis "Implementation detail of typewit") + (description "Implementation detail of typewit.") + (license license:zlib))) + +(define-public rust-tz-rs-0.6 + (package + (name "rust-tz-rs") + (version "0.6.14") + (source + (origin + (method url-fetch) + (uri (crate-uri "tz-rs" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1d720z3p6g65awzv3924dipjnldrdsv6np0h9g7x5yj8r0aip19k")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-test-flags '("--release" "--" + "--skip=timezone::test::test_time_zone_from_posix_tz" + "--skip=src/lib.rs - (line 21)" + "--skip=src/lib.rs - (line 60)") + #:cargo-inputs (("rust-const-fn" ,rust-const-fn-0.4)))) + (home-page "https://github.com/x-hgg-x/tz-rs") + (synopsis + "Rust reimplementation of libc functions localtime, gmtime and mktime") + (description + "This package provides a pure Rust reimplementation of libc functions +localtime, gmtime and mktime.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-tzdb-0.6 + (package + (name "rust-tzdb") + (version "0.6.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "tzdb" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1cbzd2c4bs9ik9dpwbacw6j08kakbnjikdndcxbrza2z6rmhyn0v")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; Doc tests segfault. + #:cargo-inputs (("rust-iana-time-zone" ,rust-iana-time-zone-0.1) + ("rust-tz-rs" ,rust-tz-rs-0.6) + ("rust-tzdb-data" ,rust-tzdb-data-0.1)))) + (home-page "https://github.com/Kijewski/tzdb") + (synopsis "Static time zone information for tz-rs") + (description "This package provides static time zone information for tz-rs.") + (license license:asl2.0))) + +(define-public rust-tzdb-data-0.1 + (package + (name "rust-tzdb-data") + (version "0.1.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "tzdb_data" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1mlqm5z8324hw2gnwhlgfn6as8cv5qhdahjwv70nb7f0zbgrz26i")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-tz-rs" ,rust-tz-rs-0.6)))) + (home-page "https://github.com/Kijewski/tzdb") + (synopsis "Static, #![no_std] time zone information for tz-rs") + (description + "This package provides static, #![no_std] time zone information for tz-rs.") + (license license:expat-0))) + (define-public rust-ubyte-0.10 (package (name "rust-ubyte") @@ -74897,8 +85321,31 @@ with the Unicode character database.") (license (list license:asl2.0 license:expat)))) +(define-public rust-ufmt-0.2 + (package + (name "rust-ufmt") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "ufmt" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "17dbpq5r09mcpalra2hmpgb2ly282s6xjsb4il8fjmrbq1p88r0s")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; method cannot be called on `String` due to unsatisfied trait bounds + #:cargo-inputs (("rust-ufmt-macros" ,rust-ufmt-macros-0.3) + ("rust-ufmt-write" ,rust-ufmt-write-0.1)))) + (home-page "https://github.com/japaric/ufmt") + (synopsis "Faster and panic-free alternative to @code{core::fmt}") + (description "This package provides a (6-40x) smaller, (2-9x) faster and +panic-free alternative to @code{core::fmt}.") + (license (list license:expat license:asl2.0)))) + (define-public rust-ufmt-0.1 (package + (inherit rust-ufmt-0.2) (name "rust-ufmt") (version "0.1.2") (source @@ -74909,22 +85356,38 @@ with the Unicode character database.") (sha256 (base32 "1pbc0gcfi7m21ly00x460pv1k2h12zb184f7wpcckpqj6g3c1lri")))) - (build-system cargo-build-system) (arguments `(#:cargo-test-flags '("--release" "--lib" "--bins" "--tests") #:cargo-inputs (("rust-proc-macro-hack" ,rust-proc-macro-hack-0.5) ("rust-ufmt-macros" ,rust-ufmt-macros-0.2) - ("rust-ufmt-write" ,rust-ufmt-write-0.1)))) + ("rust-ufmt-write" ,rust-ufmt-write-0.1)))))) + +(define-public rust-ufmt-macros-0.3 + (package + (name "rust-ufmt-macros") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "ufmt-macros" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "05ipcslk5bcpkw3j8405hhzxibr9wkn8sg33nif1cjblc6zd6dyk")))) + (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/japaric/ufmt") - (synopsis "Faster and panic-free alternative to @code{core::fmt}") - (description "This package provides a (6-40x) smaller, (2-9x) faster and -panic-free alternative to @code{core::fmt}.") + (synopsis "μfmt macros") + (description "This package provides μfmt macros.") (license (list license:expat license:asl2.0)))) (define-public rust-ufmt-macros-0.2 (package + (inherit rust-ufmt-macros-0.3) (name "rust-ufmt-macros") (version "0.2.0") (source @@ -74935,17 +85398,12 @@ panic-free alternative to @code{core::fmt}.") (sha256 (base32 "1nfpgpimg04n08cxi0mcsz803kh3kzpmllmxm2a6768cyf96raz4")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-proc-macro-hack" ,rust-proc-macro-hack-0.5) ("rust-proc-macro2" ,rust-proc-macro2-1) ("rust-quote" ,rust-quote-1) - ("rust-syn" ,rust-syn-1)))) - (home-page "https://github.com/japaric/ufmt") - (synopsis "μfmt macros") - (description "This package provides μfmt macros.") - (license (list license:expat license:asl2.0)))) + ("rust-syn" ,rust-syn-1)))))) (define-public rust-ufmt-write-0.1 (package @@ -75057,25 +85515,40 @@ arithmetic.") "This package provides a simple, fast, LRU cache implementation.") (license license:mpl2.0))) -(define-public rust-umask-1 +(define-public rust-umask-2 (package (name "rust-umask") - (version "1.0.0") + (version "2.1.0") (source (origin (method url-fetch) (uri (crate-uri "umask" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0ipyyv82lpy5xpqzmq3ra0d61vsd3bfh6b06c9w8zln41vvznblq")))) + (base32 "071xszsd6znk0ik11pxl7mwhf07clsiq3qpzw1ac0dcyak14d6pc")))) (build-system cargo-build-system) - (arguments `(#:skip-build? #t)) + (arguments + `(#:cargo-inputs (("rust-thiserror" ,rust-thiserror-1)))) (home-page "https://github.com/Canop/umask") (synopsis "Utility to deal with unix access mode") (description "This package provides an utility to deal with Unix access mode.") (license license:expat))) +(define-public rust-umask-1 + (package + (inherit rust-umask-2) + (name "rust-umask") + (version "1.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "umask" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0ipyyv82lpy5xpqzmq3ra0d61vsd3bfh6b06c9w8zln41vvznblq")))) + (arguments `(#:skip-build? #t)))) + (define-public rust-unarray-0.1 (package (name "rust-unarray") @@ -75287,6 +85760,27 @@ Internationalization Crates (UNIC) project.") in Rust.") (license (list license:expat license:asl2.0)))) +(define-public rust-unic-normal-0.9 + (package + (name "rust-unic-normal") + (version "0.9.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "unic-normal" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0qmsdf7b902mmaslhwww0hzmzqn26mzh7sraphl4dac96p9n97gh")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-unic-ucd-normal" ,rust-unic-ucd-normal-0.9)) + #:cargo-development-inputs + (("rust-unic-ucd-version" ,rust-unic-ucd-version-0.9)))) + (home-page "https://github.com/open-i18n/rust-unic/") + (synopsis "UNIC Unicode Normalization Forms") + (description "UNIC Unicode Normalization Forms.") + (license (list license:expat license:asl2.0)))) + (define-public rust-unic-segment-0.9 (package (name "rust-unic-segment") @@ -75312,6 +85806,76 @@ of text element boundaries, such as user-perceived characters (a.k.a. grapheme clusters), words, and sentences.") (license (list license:expat license:asl2.0)))) +(define-public rust-unic-ucd-category-0.9 + (package + (name "rust-unic-ucd-category") + (version "0.9.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "unic-ucd-category" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1h4ixzplc2s441vc8mc4zxliw6qfqh1ziaiv8pa1pzpwyn8lb38v")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-matches" ,rust-matches-0.1) + ("rust-unic-char-property" ,rust-unic-char-property-0.9) + ("rust-unic-char-range" ,rust-unic-char-range-0.9) + ("rust-unic-ucd-version" ,rust-unic-ucd-version-0.9)))) + (home-page "https://github.com/open-i18n/rust-unic/") + (synopsis "UNIC Unicode Character Database General Category") + (description "UNIC Unicode Character Database General Category.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-unic-ucd-hangul-0.9 + (package + (name "rust-unic-ucd-hangul") + (version "0.9.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "unic-ucd-hangul" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0m001jjck7j34hsf6kw9aidzapms9hi175yv7r9f244hw68cc7gb")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-unic-ucd-version" ,rust-unic-ucd-version-0.9)))) + (home-page "https://github.com/open-i18n/rust-unic/") + (synopsis + "UNIC Unicode Character Database Hangul Syllable Composition & Decomposition") + (description + "UNIC Unicode Character Database Hangul Syllable Composition & Decomposition.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-unic-ucd-normal-0.9 + (package + (name "rust-unic-ucd-normal") + (version "0.9.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "unic-ucd-normal" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "044laqqf09xqv4gl27f328a2f780gkzabpar72qj4b90p1rxibl6")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-unic-char-property" ,rust-unic-char-property-0.9) + ("rust-unic-char-range" ,rust-unic-char-range-0.9) + ("rust-unic-ucd-category" ,rust-unic-ucd-category-0.9) + ("rust-unic-ucd-hangul" ,rust-unic-ucd-hangul-0.9) + ("rust-unic-ucd-version" ,rust-unic-ucd-version-0.9)) + #:cargo-development-inputs + (("rust-unic-ucd-category" ,rust-unic-ucd-category-0.9)))) + (home-page "https://github.com/open-i18n/rust-unic/") + (synopsis + "UNIC Unicode Character Database Normalization Properties") + (description + "UNIC Unicode Character Database Normalization Properties.") + (license (list license:expat license:asl2.0)))) + (define-public rust-unic-ucd-segment-0.9 (package (name "rust-unic-ucd-segment") @@ -75567,17 +86131,37 @@ including Canonical and Compatible Decomposition and Recomposition, as described in Unicode Standard Annex #15.") (license (list license:expat license:asl2.0)))) +(define-public rust-unicode-reverse-1 + (package + (name "rust-unicode-reverse") + (version "1.0.8") + (source + (origin + (method url-fetch) + (uri (crate-uri "unicode-reverse" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0b4n480vd897pm4klmmz07w8p45kb5ds0037kakd1lmhxfn5vshb")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-unicode-segmentation" ,rust-unicode-segmentation-1)) + #:cargo-development-inputs (("rust-quickcheck" ,rust-quickcheck-0.4)))) + (home-page "https://github.com/mbrubeck/unicode-reverse") + (synopsis "Unicode-aware in-place string reversal") + (description "Unicode-aware in-place string reversal.") + (license (list license:expat license:asl2.0)))) + (define-public rust-unicode-segmentation-1 (package (name "rust-unicode-segmentation") - (version "1.10.1") + (version "1.11.0") (source (origin (method url-fetch) (uri (crate-uri "unicode-segmentation" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0dky2hm5k51xy11hc3nk85p533rvghd462b6i0c532b7hl4j9mhx")))) + (base32 "00kjpwp1g8fqm45drmwivlacn3y9jx73bvs09n6s3x73nqi7vj6l")))) (build-system cargo-build-system) (arguments `(#:cargo-development-inputs @@ -75590,6 +86174,28 @@ described in Unicode Standard Annex #15.") boundaries according to Unicode Standard Annex #29 rules.") (license (list license:expat license:asl2.0)))) +(define-public rust-unicode-truncate-0.2 + (package + (name "rust-unicode-truncate") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "unicode-truncate" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0hlf6k1d7s1qqdvhxwh4xl8wd1wvqm0vr0pazxq74jksbz5fajx0")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-unicode-width" ,rust-unicode-width-0.1)) + #:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.3)))) + (home-page "https://github.com/Aetf/unicode-truncate") + (synopsis "Unicode-aware `str` truncate") + (description + "This package provides a unicode-aware algorithm to pad or truncate `str` +in terms of displayed width.") + (license (list license:expat license:asl2.0)))) + (define-public rust-unicode-width-0.1 (package (name "rust-unicode-width") @@ -75912,6 +86518,40 @@ untrusted inputs in Rust.") (sha256 (base32 "0byf88b7ca1kb5aap8f6npp6xncvg95dnma8ipmnmd4n9r5izkam")))))) +(define-public rust-uom-0.34 + (package + (name "rust-uom") + (version "0.34.0") + (source (origin + (method url-fetch) + (uri (crate-uri "uom" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "190n79b5ywa9w0j13ld0q6dphz7vzsjkwrpp8pjnwrczsvfhxxg8")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-num-complex" ,rust-num-complex-0.4) + ("rust-num-rational" ,rust-num-rational-0.4) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-typenum" ,rust-typenum-1) + ("rust-serde" ,rust-serde-1) + ("rust-num-bigint" ,rust-num-bigint-0.4)) + #:cargo-development-inputs (("rust-approx" ,rust-approx-0.5) + ("rust-quickcheck" ,rust-quickcheck-0.8) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-static-assertions" ,rust-static-assertions-1)))) + (home-page "https://github.com/iliekturtles/uom") + (synopsis "Units of measurement") + (description + "@code{uom} (Units of measurement) is a crate that does automatic type-safe +zero-cost dimensional analysis. You can create your own systems or use the pre-built +International System of Units (SI) which is based on the International System of +Quantities (ISQ) and includes numerous quantities (length, mass, time, ...) with +conversion factors for even more numerous measurement units (meter, kilometer, foot, +mile, ...).") + (license (list license:expat license:asl2.0)))) + (define-public rust-ureq-2 (package (name "rust-ureq") @@ -76196,6 +86836,213 @@ first byte.") (base32 "0zamsj2986shm4x9zncjf2m5qy9scaw7qnxw4f89b2afpg6a8wl7")))))) +(define-public rust-uu-cp-0.0.23 + (package + (name "rust-uu-cp") + (version "0.0.23") + (source + (origin + (method url-fetch) + (uri (crate-uri "uu_cp" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1snwk4fh6fvvvvqc1y660dr8lw95in9hazi49licnlgszh60k3jc")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-clap" ,rust-clap-4) + ("rust-exacl" ,rust-exacl-0.11) + ("rust-filetime" ,rust-filetime-0.2) + ("rust-indicatif" ,rust-indicatif-0.17) + ("rust-libc" ,rust-libc-0.2) + ("rust-quick-error" ,rust-quick-error-2) + ("rust-selinux" ,rust-selinux-0.4) + ("rust-uucore" ,rust-uucore-0.0.25) + ("rust-walkdir" ,rust-walkdir-2) + ("rust-xattr" ,rust-xattr-1)))) + (home-page "https://github.com/uutils/coreutils") + (synopsis "cp ~ (uutils) copy SOURCE to DESTINATION") + (description "This package provides the @code{cp} command from uutils.") + (license license:expat))) + +(define-public rust-uu-mkdir-0.0.23 + (package + (name "rust-uu-mkdir") + (version "0.0.23") + (source + (origin + (method url-fetch) + (uri (crate-uri "uu_mkdir" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0lf84gxjw1ii53xmlr4rnlgpqci5zw8scqf1qpmid3bkkry6bgyw")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-clap" ,rust-clap-4) + ("rust-uucore" ,rust-uucore-0.0.25)))) + (home-page "https://github.com/uutils/coreutils") + (synopsis "mkdir ~ (uutils) create DIRECTORY") + (description "This package provides the @code{mkdir} command from uutils.") + (license license:expat))) + +(define-public rust-uu-mktemp-0.0.23 + (package + (name "rust-uu-mktemp") + (version "0.0.23") + (source + (origin + (method url-fetch) + (uri (crate-uri "uu_mktemp" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1jrik3nawxcxxqbhlzjl9sb8xwwxmmb5lm7rkdi61hcyilh32i8m")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-clap" ,rust-clap-4) + ("rust-rand" ,rust-rand-0.8) + ("rust-tempfile" ,rust-tempfile-3) + ("rust-uucore" ,rust-uucore-0.0.25)))) + (home-page "https://github.com/uutils/coreutils") + (synopsis "mktemp ~ (uutils) create and display a temporary file or directory") + (description "This package provides the @code{mktemp} command from uutils.") + (license license:expat))) + +(define-public rust-uu-mv-0.0.23 + (package + (name "rust-uu-mv") + (version "0.0.23") + (source + (origin + (method url-fetch) + (uri (crate-uri "uu_mv" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1z2cdcnf1q6zgzycimlbg0xyqh43v8x49vsr0sx1sbjdsdhpwc2y")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-clap" ,rust-clap-4) + ("rust-fs-extra" ,rust-fs-extra-1) + ("rust-indicatif" ,rust-indicatif-0.17) + ("rust-uucore" ,rust-uucore-0.0.25)))) + (home-page "https://github.com/uutils/coreutils") + (synopsis "mv ~ (uutils) move (rename) SOURCE to DESTINATION") + (description "This package provides the @code{mv} command from uutils.") + (license license:expat))) + +(define-public rust-uu-whoami-0.0.23 + (package + (name "rust-uu-whoami") + (version "0.0.23") + (source + (origin + (method url-fetch) + (uri (crate-uri "uu_whoami" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0k9p305ph1nx29gr02alasj3y8xczhh8yaxj3zzcnd0znk1rsn3h")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-clap" ,rust-clap-4) + ("rust-libc" ,rust-libc-0.2) + ("rust-uucore" ,rust-uucore-0.0.25) + ("rust-windows-sys" ,rust-windows-sys-0.48)))) + (home-page "https://github.com/uutils/coreutils") + (synopsis + "whoami ~ (uutils) display user name of current effective user ID") + (description "This package provides the @code{whoami} command from uutils.") + (license license:expat))) + +(define-public rust-uucore-0.0.25 + (package + (name "rust-uucore") + (version "0.0.25") + (source + (origin + (method url-fetch) + (uri (crate-uri "uucore" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1d59qc3d2z9dkf89y22c5kj7l5izfb4p3qkpd32xnhyb59r4m693")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-blake2b-simd" ,rust-blake2b-simd-1) + ("rust-blake3" ,rust-blake3-1) + ("rust-clap" ,rust-clap-4) + ("rust-data-encoding" ,rust-data-encoding-2) + ("rust-data-encoding-macro" ,rust-data-encoding-macro-0.1) + ("rust-digest" ,rust-digest-0.10) + ("rust-dns-lookup" ,rust-dns-lookup-2) + ("rust-dunce" ,rust-dunce-1) + ("rust-glob" ,rust-glob-0.3) + ("rust-hex" ,rust-hex-0.4) + ("rust-itertools" ,rust-itertools-0.12) + ("rust-libc" ,rust-libc-0.2) + ("rust-md-5" ,rust-md-5-0.10) + ("rust-memchr" ,rust-memchr-2) + ("rust-nix" ,rust-nix-0.28) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-os-display" ,rust-os-display-0.1) + ("rust-sha1" ,rust-sha1-0.10) + ("rust-sha2" ,rust-sha2-0.10) + ("rust-sha3" ,rust-sha3-0.10) + ("rust-sm3" ,rust-sm3-0.4) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-time" ,rust-time-0.3) + ("rust-uucore-procs" ,rust-uucore-procs-0.0.25) + ("rust-walkdir" ,rust-walkdir-2) + ("rust-wild" ,rust-wild-2) + ("rust-winapi-util" ,rust-winapi-util-0.1) + ("rust-windows-sys" ,rust-windows-sys-0.48) + ("rust-xattr" ,rust-xattr-1) + ("rust-z85" ,rust-z85-3)) + #:cargo-development-inputs (("rust-clap" ,rust-clap-4) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-tempfile" ,rust-tempfile-3)))) + (home-page "https://github.com/uutils/coreutils") + (synopsis "uutils ~ 'core' uutils code library") + (description "This packge provides the core uutils code library.") + (license license:expat))) + +(define-public rust-uucore-procs-0.0.25 + (package + (name "rust-uucore-procs") + (version "0.0.25") + (source + (origin + (method url-fetch) + (uri (crate-uri "uucore_procs" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "02bkjwh4fp1cc8cmp6jqda8f48kpav9iqss424cb2lrfhfa1bxgp")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-uuhelp-parser" ,rust-uuhelp-parser-0.0.25)))) + (home-page "https://github.com/uutils/coreutils") + (synopsis "uutils ~ 'uucore' proc-macros") + (description "This package provides the uucore proc-macros.") + (license license:expat))) + +(define-public rust-uuhelp-parser-0.0.25 + (package + (name "rust-uuhelp-parser") + (version "0.0.25") + (source + (origin + (method url-fetch) + (uri (crate-uri "uuhelp_parser" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0gsfy0dkwzlyyq4abwf0c7gks7m1qm0yzl58sl265n5dllr6hymc")))) + (build-system cargo-build-system) + (home-page "https://github.com/uutils/coreutils") + (synopsis + "Collection of functions to parse the markdown code of help files") + (description + "This package provides a collection of functions to parse the markdown code +of help files.") + (license license:expat))) + (define-public rust-uuid-1 (package (name "rust-uuid") @@ -76348,28 +87195,42 @@ first byte.") ;; The user can choose either license. (license (list license:asl2.0 license:expat)))) -(define-public rust-uutils-term-grid-0.3 +(define-public rust-uutils-term-grid-0.6 (package (name "rust-uutils-term-grid") - (version "0.3.0") + (version "0.6.0") (source (origin (method url-fetch) (uri (crate-uri "uutils_term_grid" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1ixvj893jrcvv76m7cgr99fc25la6xl2101qva6ni646aqm4b2dk")))) + (base32 "1ys1y4bjdgwhvd3c9b2c8hx2dmnxjsgqgg3sll1mgfmlmnsfz7gq")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs (("rust-unicode-width" ,rust-unicode-width-0.1)))) + `(#:cargo-inputs (("rust-ansi-width" ,rust-ansi-width-0.1)))) (home-page "https://github.com/uutils/uutils-term-grid") (synopsis "Fork of the @code{term_grid} for formatting strings into a grid layout") - (description - "A fork of @code{term_grid}, this package provides a library for -formatting strings into a grid layout.") + (description "A fork of @code{term_grid}, this package provides a library +for formatting strings into a grid layout.") (license license:expat))) +(define-public rust-uutils-term-grid-0.3 + (package + (inherit rust-uutils-term-grid-0.6) + (name "rust-uutils-term-grid") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "uutils_term_grid" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1ixvj893jrcvv76m7cgr99fc25la6xl2101qva6ni646aqm4b2dk")))) + (arguments + `(#:cargo-inputs (("rust-unicode-width" ,rust-unicode-width-0.1)))))) + (define-public rust-uzers-0.11 (package (name "rust-uzers") @@ -76523,14 +87384,14 @@ for @code{Valuable} types.") (define-public rust-value-bag-1 (package (name "rust-value-bag") - (version "1.4.2") + (version "1.9.0") (source (origin (method url-fetch) (uri (crate-uri "value-bag" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1gjvsnhhf9jp8h62zin6azqrpmgmnxq2ppj72d2dcayy5n8f2wja")))) + (base32 "00aij8p1n7vcggkb9nxpwx9g5nqzclrf7prd1wpi9c3sscvw312s")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -76547,18 +87408,18 @@ for @code{Valuable} types.") (define-public rust-value-bag-serde1-1 (package (name "rust-value-bag-serde1") - (version "1.4.2") + (version "1.9.0") (source (origin (method url-fetch) (uri (crate-uri "value-bag-serde1" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1gsp0cn62ay2qq52wzck0j66iavf9k03y6ipmnx3bjqyg7f3kfh7")))) + (base32 "12rjnrh2g3ijvjgfh78y7x1ilk3mw2svri93nymsjxxhbh6gbb6c")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-erased-serde" ,rust-erased-serde-0.3) + (("rust-erased-serde" ,rust-erased-serde-0.4) ("rust-serde" ,rust-serde-1) ("rust-serde-buf" ,rust-serde-buf-0.1) ("rust-serde-fmt" ,rust-serde-fmt-1) @@ -76572,14 +87433,14 @@ for @code{Valuable} types.") (define-public rust-value-bag-sval2-1 (package (name "rust-value-bag-sval2") - (version "1.4.2") + (version "1.9.0") (source (origin (method url-fetch) (uri (crate-uri "value-bag-sval2" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0i899mjnryxw0sp92n8qgnm1s2m56ba27l3qazsbnmqah486rq63")))) + (base32 "0nr8453w1357xc70ilbvwcg4qa6bgll44pci0fbznb82hvjbm18p")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -76596,6 +87457,54 @@ for @code{Valuable} types.") (description "Implementation detail for value-bag.") (license (list license:asl2.0 license:expat)))) +(define-public rust-value-trait-0.8 + (package + (name "rust-value-trait") + (version "0.8.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "value-trait" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1d3yl8g6xzp4ah4r7nrqrb1vxy9vgp53z80vy9ypjxz6q6cdpn6s")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-abi-stable" ,rust-abi-stable-0.11) + ("rust-float-cmp" ,rust-float-cmp-0.9) + ("rust-halfbrown" ,rust-halfbrown-0.2) + ("rust-hashbrown" ,rust-hashbrown-0.14) + ("rust-itoa" ,rust-itoa-1) + ("rust-ryu" ,rust-ryu-1)))) + (home-page "https://github.com/simd-lite/value-trait") + (synopsis "Traits to deal with JSONesque values") + (description "This package provides traits to deal with JSONesque values.") + (license (list license:asl2.0 license:expat)))) + +(define-public rust-varbincode-0.1 + (package + (name "rust-varbincode") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "varbincode" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "17vgwalm7a1lryjj565p4rnx5h3hr8vwm5504r92s7j41f8gl4mp")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-byteorder" ,rust-byteorder-1) + ("rust-leb128" ,rust-leb128-0.2) + ("rust-serde" ,rust-serde-1)) + #:cargo-development-inputs (("rust-serde-derive" ,rust-serde-derive-1)))) + (home-page "https://github.com/wez/varbincode") + (synopsis "Binary encoder and decoder with variable length integer") + (description + "This package provides a binary encoder / decoder with variable length +integer encoding implementation in Rust.") + (license license:expat))) + (define-public rust-vcpkg-0.2 (package (name "rust-vcpkg") @@ -76654,6 +87563,29 @@ for @code{Valuable} types.") (license (list license:asl2.0 license:expat)))) +(define-public rust-vec1-1 + (package + (name "rust-vec1") + (version "1.12.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "vec1" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0dk9qlly3n6b5g71p9rxnnfyx7v1d31364x8wbabz2f1zz7hvdpz")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-serde" ,rust-serde-1) + ("rust-smallvec" ,rust-smallvec-1)) + #:cargo-development-inputs (("rust-proptest" ,rust-proptest-1) + ("rust-serde-json" ,rust-serde-json-1)))) + (home-page "https://github.com/rustonaut/vec1/") + (synopsis "Vec wrapper assuring that it has at least 1 element") + (description "This package provides a std Vec wrapper assuring that it has +at least 1 element.") + (license (list license:expat license:asl2.0)))) + (define-public rust-vek-0.15 (package (name "rust-vek") @@ -77115,17 +88047,16 @@ updated when the crate version changes.") (package (inherit rust-vte-0.11) (name "rust-vte") - (version "0.10.0") + (version "0.10.1") (source (origin (method url-fetch) (uri (crate-uri "vte" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1mnjw3f071xbvapdgdf8mcdglw60dadcc5hhvz5zpljm53nmzwid")))) + (base32 "10srmy9ssircrwsb5lpx3fbhx71460j77kvz0krz38jcmf9fdg3c")))) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-arrayvec" ,rust-arrayvec-0.5) ("rust-utf8parse" ,rust-utf8parse-0.2) ("rust-vte-generate-state-changes" @@ -77256,14 +88187,14 @@ specified across Unix and Windows platforms.") (define-public rust-walkdir-2 (package (name "rust-walkdir") - (version "2.4.0") + (version "2.5.0") (source (origin (method url-fetch) (uri (crate-uri "walkdir" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1vjl9fmfc4v8k9ald23qrpcbyb8dl1ynyq8d516cm537r1yqa7fp")))) + (base32 "0jsy7a710qv8gld5957ybrnc07gavppp963gs32xk4ag8130jy99")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -77752,8 +88683,64 @@ attribute that is not in the shared backend crate.") (("rust-proc-macro2" ,rust-proc-macro2-0.4) ("rust-quote" ,rust-quote-0.6)))))) +(define-public rust-wasm-encoder-0.38 + (package + (name "rust-wasm-encoder") + (version "0.38.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "wasm-encoder" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0gwzfwals53swmp18n4mwaqx9jldrgy4647xw97pz76yhhcbblha")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; unresolved import `wasmparser` + #:cargo-inputs (("rust-leb128" ,rust-leb128-0.2) + ("rust-wasmparser" ,rust-wasmparser-0.118)) + #:cargo-development-inputs (("rust-anyhow" ,rust-anyhow-1) + ("rust-tempfile" ,rust-tempfile-3)))) + (home-page + "https://github.com/bytecodealliance/wasm-tools/tree/main/crates/wasm-encoder") + (synopsis "Low-level WebAssembly encoder") + (description + "This package provides a low-level @code{WebAssembly} encoder.") + (license license:asl2.0))) + +(define-public rust-wasm-streams-0.4 + (package + (name "rust-wasm-streams") + (version "0.4.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "wasm-streams" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0ad17c59xb8fffsnbrqbyqz93hb66nzxhizpii31icb31g4w8pdn")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-futures-util" ,rust-futures-util-0.3) + ("rust-js-sys" ,rust-js-sys-0.3) + ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2) + ("rust-wasm-bindgen-futures" ,rust-wasm-bindgen-futures-0.4) + ("rust-web-sys" ,rust-web-sys-0.3)) + #:cargo-development-inputs + (("rust-pin-project" ,rust-pin-project-1) + ("rust-tokio" ,rust-tokio-1) + ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3) + ("rust-web-sys" ,rust-web-sys-0.3)))) + (home-page "https://github.com/MattiasBuelens/wasm-streams/") + (synopsis "Bridge between web streams and Rust streams using WebAssembly") + (description + "Bridging between web streams and Rust streams using WebAssembly.") + (license (list license:expat license:asl2.0)))) + (define-public rust-wasm-streams-0.3 (package + (inherit rust-wasm-streams-0.4) (name "rust-wasm-streams") (version "0.3.0") (source @@ -77763,7 +88750,6 @@ attribute that is not in the shared backend crate.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "1iqa4kmhbsjj8k4q15i1x0x4p3xda0dhbg7zw51mydr4g129sq5l")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-futures-util" ,rust-futures-util-0.3) ("rust-js-sys" ,rust-js-sys-0.3) @@ -77773,12 +88759,7 @@ attribute that is not in the shared backend crate.") #:cargo-development-inputs (("rust-pin-project" ,rust-pin-project-1) ("rust-tokio" ,rust-tokio-1) ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3) - ("rust-web-sys" ,rust-web-sys-0.3)))) - (home-page "https://github.com/MattiasBuelens/wasm-streams/") - (synopsis "Bridge between web streams and Rust streams using WebAssembly") - (description - "Bridging between web streams and Rust streams using WebAssembly.") - (license (list license:expat license:asl2.0)))) + ("rust-web-sys" ,rust-web-sys-0.3)))))) (define-public rust-wasm-streams-0.2 (package @@ -77804,8 +88785,62 @@ attribute that is not in the shared backend crate.") ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3) ("rust-web-sys" ,rust-web-sys-0.3)))))) +(define-public rust-wasm-sync-0.1 + (package + (name "rust-wasm-sync") + (version "0.1.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "wasm_sync" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1smhpgk5jiir089y5w6y2rgqq9aqzrbxlb4x1vzl3v3zvv561wyg")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-js-sys" ,rust-js-sys-0.3) + ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2) + ("rust-web-sys" ,rust-web-sys-0.3)))) + (home-page "https://github.com/DouglasDwyer/wasm_sync") + (synopsis "Synchronization primitives for both web and native") + (description "This package provides synchronization primitives for both web +and native running processes.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-wasmparser-0.118 + (package + (name "rust-wasmparser") + (version "0.118.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "wasmparser" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0365n7dd01fh2jklq6q41nszhyyaz82shd4q3nhf4s5q397ibwbp")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; failed to resolve: use of undeclared crate or module `wat` + #:cargo-inputs (("rust-indexmap" ,rust-indexmap-2) + ("rust-semver" ,rust-semver-1)) + #:cargo-development-inputs (("rust-anyhow" ,rust-anyhow-1) + ("rust-criterion" ,rust-criterion-0.3) + ("rust-env-logger" ,rust-env-logger-0.9) + ("rust-log" ,rust-log-0.4) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-rayon" ,rust-rayon-1) + ("rust-wasm-encoder" ,rust-wasm-encoder-0.38)))) + (home-page + "https://github.com/bytecodealliance/wasm-tools/tree/main/crates/wasmparser") + (synopsis "Simple event-driven library for parsing WebAssembly binary files") + (description + "This package provides a simple event-driven library for parsing +@code{WebAssembly} binary files.") + (license license:asl2.0))) + (define-public rust-wasmparser-0.57 (package + (inherit rust-wasmparser-0.118) (name "rust-wasmparser") (version "0.57.0") (source @@ -77815,50 +88850,287 @@ attribute that is not in the shared backend crate.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "19kslk9pv1bcyp85w63dn1adbp13kz7kjha80abnwz27bmbxvz9j")))) + (arguments `(#:skip-build? #t)))) + +(define-public rust-watchexec-2 + (package + (name "rust-watchexec") + (version "2.3.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "watchexec" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "120g73qpywbrzlcma9nhgaymm44aw2516xwl0fima8yy2ig22car")) + (modules '((guix build utils))) + (snippet + '(begin (substitute* "Cargo.toml" + (("\"= *([[:digit:]]+(\\.[[:digit:]]+)*)" _ version) + (string-append "\"^" version))))))) (build-system cargo-build-system) - (arguments `(#:skip-build? #t)) - (home-page "https://github.com/bytecodealliance/wasm-tools/tree/main/crates/wasmparser") - (synopsis "Simple event-driven library for parsing WebAssembly binary files") + (arguments + `(#:cargo-inputs + (("rust-async-priority-channel" ,rust-async-priority-channel-0.1) + ("rust-async-recursion" ,rust-async-recursion-1) + ("rust-atomic-take" ,rust-atomic-take-1) + ("rust-clearscreen" ,rust-clearscreen-2) + ("rust-command-group" ,rust-command-group-2) + ("rust-futures" ,rust-futures-0.3) + ("rust-ignore-files" ,rust-ignore-files-1) + ("rust-miette" ,rust-miette-5) + ("rust-nix" ,rust-nix-0.26) + ("rust-normalize-path" ,rust-normalize-path-0.2) + ("rust-notify" ,rust-notify-5) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-project-origins" ,rust-project-origins-1) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-tokio" ,rust-tokio-1) + ("rust-tracing" ,rust-tracing-0.1) + ("rust-watchexec-events" ,rust-watchexec-events-1) + ("rust-watchexec-signals" ,rust-watchexec-signals-1)) + #:cargo-development-inputs + (("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3)))) + (home-page "https://watchexec.github.io") + (synopsis "Library to execute commands in response to file modifications") (description - "This package provides a simple event-driven library for parsing -WebAssembly binary files.") + "This crate is a library to execute commands in response to file +modifications.") (license license:asl2.0))) (define-public rust-watchexec-1 (package + (inherit rust-watchexec-2) (name "rust-watchexec") - (version "1.16.0") + (version "1.17.2") (source (origin (method url-fetch) (uri (crate-uri "watchexec" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1v52fi5fvjr7h5npyjkwnfc7801qrl4ayzgq4k03ylxr4lkbvhsb")))) + (base32 "0r8j6qvkbr5k5ipyzw0v1lsglhf7l99n9m529mck2ki7ymzqv4iq")) + (modules '((guix build utils))) + (snippet + '(begin (substitute* "Cargo.toml" + (("\"= *([[:digit:]]+(\\.[[:digit:]]+)*)" _ version) + (string-append "\"^" version))))))) + (arguments + `(#:cargo-test-flags + '("--release" "--" + ;; Not all files included. + "--skip=gitignore::tests::handles_negative_patterns" + "--skip=gitignore::tests::leading_double_wildcard" + "--skip=gitignore::tests::leading_slash" + "--skip=gitignore::tests::matches_exact" + "--skip=gitignore::tests::matches_simple_wildcard" + "--skip=gitignore::tests::matches_subdir_exact" + "--skip=gitignore::tests::sandwiched_double_wildcard" + "--skip=gitignore::tests::wildcard_with_dir" + "--skip=ignore::tests::handles_whitelisting" + "--skip=ignore::tests::leading_double_wildcard" + "--skip=ignore::tests::leading_slash" + "--skip=ignore::tests::matches_exact" + "--skip=ignore::tests::matches_simple_wildcard" + "--skip=ignore::tests::matches_subdir_exact" + "--skip=ignore::tests::sandwiched_double_wildcard" + "--skip=ignore::tests::wildcard_with_dir" + "--skip=notification_filter::tests::test_filename" + "--skip=notification_filter::tests::test_ignores_take_precedence" + "--skip=notification_filter::tests::test_multiple_ignores" + "--skip=notification_filter::tests::test_recursive_directory_ignore") + #:cargo-inputs (("rust-clearscreen" ,rust-clearscreen-1) + ("rust-command-group" ,rust-command-group-1) + ("rust-derive-builder" ,rust-derive-builder-0.10) + ("rust-glob" ,rust-glob-0.3) + ("rust-globset" ,rust-globset-0.4) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-log" ,rust-log-0.4) + ("rust-nix" ,rust-nix-0.22) + ("rust-notify" ,rust-notify-4) + ("rust-walkdir" ,rust-walkdir-2) + ("rust-winapi" ,rust-winapi-0.3)))))) + +(define-public rust-watchexec-events-1 + (package + (name "rust-watchexec-events") + (version "1.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "watchexec-events" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1qra2hpkdf5ln1vb5jpxp17s3va7dm2svb8d067r2xgx0az3nq01")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-clearscreen" ,rust-clearscreen-1) - ("rust-derive-builder" ,rust-derive-builder-0.10) - ("rust-glob" ,rust-glob-0.3) - ("rust-globset" ,rust-globset-0.4) - ("rust-lazy-static" ,rust-lazy-static-1) - ("rust-log" ,rust-log-0.4) - ("rust-nix" ,rust-nix-0.20) - ("rust-notify" ,rust-notify-4) - ("rust-walkdir" ,rust-walkdir-2) - ("rust-winapi" ,rust-winapi-0.3)))) + `(#:tests? #f ; `Event: serde::de::Deserialize<'_>` is not satisfied + #:cargo-inputs (("rust-nix" ,rust-nix-0.26) + ("rust-notify" ,rust-notify-5) + ("rust-serde" ,rust-serde-1) + ("rust-watchexec-signals" ,rust-watchexec-signals-1)) + #:cargo-development-inputs (("rust-serde-json" ,rust-serde-json-1) + ("rust-snapbox" ,rust-snapbox-0.4)))) (home-page "https://github.com/watchexec/watchexec") - (synopsis - "Library to execute commands in response to file modifications") + (synopsis "Watchexec's event types") + (description "This package provides watchexec's event types.") + (license (list license:asl2.0 license:expat)))) + +(define-public rust-watchexec-filterer-globset-1 + (package + (name "rust-watchexec-filterer-globset") + (version "1.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "watchexec-filterer-globset" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "045j0cp83yl6csn04qi19d5jfgfzylgcnvgziksqjcdgrv6b1c54")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; unresolved import `tracing_subscriber::EnvFilter` + #:cargo-inputs + (("rust-ignore" ,rust-ignore-0.4) + ("rust-ignore-files" ,rust-ignore-files-1) + ("rust-tracing" ,rust-tracing-0.1) + ("rust-watchexec" ,rust-watchexec-2) + ("rust-watchexec-filterer-ignore" ,rust-watchexec-filterer-ignore-1)) + #:cargo-development-inputs + (("rust-project-origins" ,rust-project-origins-1) + ("rust-tokio" ,rust-tokio-1) + ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3)))) + (home-page "https://watchexec.github.io") + (synopsis "Watchexec filterer component based on globset") (description - "This crate is a library to execute commands in response to file -modifications.") + "This package provides a watchexec filterer component based on globsets.") + (license license:asl2.0))) + +(define-public rust-watchexec-filterer-ignore-1 + (package + (name "rust-watchexec-filterer-ignore") + (version "1.2.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "watchexec-filterer-ignore" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "18sfshgvi8d68xc9vc9pz7dar6cfbgzclnfdkyhvgkbw6qhg0igk")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; unresolved import `tracing_subscriber::EnvFilter` + #:cargo-inputs (("rust-dunce" ,rust-dunce-1) + ("rust-ignore" ,rust-ignore-0.4) + ("rust-ignore-files" ,rust-ignore-files-1) + ("rust-tracing" ,rust-tracing-0.1) + ("rust-watchexec" ,rust-watchexec-2) + ("rust-watchexec-signals" ,rust-watchexec-signals-1)) + #:cargo-development-inputs + (("rust-project-origins" ,rust-project-origins-1) + ("rust-tokio" ,rust-tokio-1) + ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3)))) + (home-page "https://watchexec.github.io") + (synopsis "Watchexec filterer component for ignore files") + (description + "This package provides a watchexec filterer component for ignore files.") (license license:asl2.0))) +(define-public rust-watchexec-signals-1 + (package + (name "rust-watchexec-signals") + (version "1.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "watchexec-signals" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1rd7sqfvd96lbf05w74p7v59ch8xspy5ah509k4h329qdkwmsanc")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-miette" ,rust-miette-5) + ("rust-nix" ,rust-nix-0.26) + ("rust-serde" ,rust-serde-1) + ("rust-thiserror" ,rust-thiserror-1)))) + (home-page "https://github.com/watchexec/watchexec") + (synopsis "Watchexec's signal types") + (description "This package provides watchexec's signal types.") + (license (list license:asl2.0 license:expat)))) + +(define-public rust-wax-0.6 + (package + (name "rust-wax") + (version "0.6.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "wax" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0mqk9qxsjlbwnjnj0gkaa29qm3mmgbgrc6pd4qpjvcmsl25af4ld")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-const-format" ,rust-const-format-0.2) + ("rust-itertools" ,rust-itertools-0.11) + ("rust-miette" ,rust-miette-5) + ("rust-nom" ,rust-nom-7) + ("rust-pori" ,rust-pori-0.0.0) + ("rust-regex" ,rust-regex-1) + ("rust-tardar" ,rust-tardar-0.1) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-walkdir" ,rust-walkdir-2)) + #:cargo-development-inputs (("rust-build-fs-tree" ,rust-build-fs-tree-0.6) + ("rust-dunce" ,rust-dunce-1) + ("rust-tempfile" ,rust-tempfile-3)))) + (home-page "https://github.com/olson-sean-k/wax") + (synopsis "Globs that can be matched against paths and directory trees") + (description + "This package provides opinionated and portable globs that can be matched +against paths and directory trees.") + (license license:expat))) + +(define-public rust-wl-clipboard-rs-0.8 + (package + (name "rust-wl-clipboard-rs") + (version "0.8.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "wl-clipboard-rs" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1nwa0bg6jpq5sd8x94xgkj0yk7zcz2m3sg2mm26b35qlj5rigd0j")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; Failed to create a server socket. + #:cargo-inputs (("rust-derive-new" ,rust-derive-new-0.6) + ("rust-libc" ,rust-libc-0.2) + ("rust-log" ,rust-log-0.4) + ("rust-nix" ,rust-nix-0.28) + ("rust-os-pipe" ,rust-os-pipe-1) + ("rust-tempfile" ,rust-tempfile-3) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-tree-magic-mini" ,rust-tree-magic-mini-3) + ("rust-wayland-backend" ,rust-wayland-backend-0.3) + ("rust-wayland-client" ,rust-wayland-client-0.31) + ("rust-wayland-protocols" ,rust-wayland-protocols-0.31) + ("rust-wayland-protocols-wlr" ,rust-wayland-protocols-wlr-0.2)) + #:cargo-development-inputs + (("rust-proptest" ,rust-proptest-1) + ("rust-proptest-derive" ,rust-proptest-derive-0.4) + ("rust-wayland-protocols" ,rust-wayland-protocols-0.31) + ("rust-wayland-protocols-wlr" ,rust-wayland-protocols-wlr-0.2) + ("rust-wayland-server" ,rust-wayland-server-0.31)))) + (home-page "https://github.com/YaLTeR/wl-clipboard-rs") + (synopsis "Access to the Wayland clipboard") + (description "This package provides access to the Wayland clipboard +for terminal and other window-less applications.") + (license (list license:expat license:asl2.0)))) + (define-public rust-wl-clipboard-rs-0.7 (package + (inherit rust-wl-clipboard-rs-0.8) (name "rust-wl-clipboard-rs") (version "0.7.0") (source @@ -77868,7 +89140,6 @@ modifications.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "1n8sg981h3d08hnnlrsgs81w2qz3n8a5ml0jcsgnapdpzcyk06lq")))) - (build-system cargo-build-system) (arguments `(#:tests? #f ; Failed to create a server socket. #:cargo-inputs (("rust-derive-new" ,rust-derive-new-0.5) @@ -77883,12 +89154,7 @@ modifications.") ("rust-wayland-protocols" ,rust-wayland-protocols-0.29)) #:cargo-development-inputs (("rust-wayland-protocols" ,rust-wayland-protocols-0.29) - ("rust-wayland-server" ,rust-wayland-server-0.29)))) - (home-page "https://github.com/YaLTeR/wl-clipboard-rs") - (synopsis "Access to the Wayland clipboard") - (description "This package provides access to the Wayland clipboard -for terminal and other window-less applications.") - (license (list license:expat license:asl2.0)))) + ("rust-wayland-server" ,rust-wayland-server-0.29)))))) (define-public rust-wl-clipboard-rs-0.4 (package @@ -77949,21 +89215,22 @@ for terminal and other window-less applications.") "Bindings for all Web APIs, a procedurally generated crate from WebIDL.") (license (list license:expat license:asl2.0)))) -(define-public rust-web-time-0.2 +(define-public rust-web-time-1 (package (name "rust-web-time") - (version "0.2.4") + (version "1.1.0") (source (origin (method url-fetch) (uri (crate-uri "web-time" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1q6gk0nkwbfz30g1pz8g52mq00zjx7m5im36k3474aw73jdh8c5a")))) + (base32 "1fx05yqx83dhx628wb70fyy10yjfq1jpl20qfqhdkymi13rq0ras")))) (build-system cargo-build-system) (arguments - `(#:tests? #f ; Not all files included. + `(#:tests? #f ; TODO: check if not all files included. #:cargo-inputs (("rust-js-sys" ,rust-js-sys-0.3) + ("rust-serde" ,rust-serde-1) ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)) #:cargo-development-inputs (("rust-futures-channel" ,rust-futures-channel-0.3) @@ -77971,15 +89238,43 @@ for terminal and other window-less applications.") ("rust-getrandom" ,rust-getrandom-0.2) ("rust-pollster" ,rust-pollster-0.3) ("rust-rand" ,rust-rand-0.8) + ("rust-serde-json" ,rust-serde-json-1) ("rust-wasm-bindgen-futures" ,rust-wasm-bindgen-futures-0.4) ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3) ("rust-web-sys" ,rust-web-sys-0.3)))) (home-page "https://github.com/daxpedda/web-time") (synopsis "Drop-in replacement for std::time for Wasm in browsers") (description - "Drop-in replacement for @code{std::time} for Wasm in browsers.") + "This package provides a drop-in replacement for @code{std::time} +for Wasm in browsers.") (license (list license:expat license:asl2.0)))) +(define-public rust-web-time-0.2 + (package + (inherit rust-web-time-1) + (name "rust-web-time") + (version "0.2.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "web-time" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1q6gk0nkwbfz30g1pz8g52mq00zjx7m5im36k3474aw73jdh8c5a")))) + (arguments + `(#:tests? #f ; TODO: check if not all files included. + #:cargo-inputs (("rust-js-sys" ,rust-js-sys-0.3) + ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2)) + #:cargo-development-inputs + (("rust-futures-channel" ,rust-futures-channel-0.3) + ("rust-futures-util" ,rust-futures-util-0.3) + ("rust-getrandom" ,rust-getrandom-0.2) + ("rust-pollster" ,rust-pollster-0.3) + ("rust-rand" ,rust-rand-0.8) + ("rust-wasm-bindgen-futures" ,rust-wasm-bindgen-futures-0.4) + ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3) + ("rust-web-sys" ,rust-web-sys-0.3)))))) + (define-public rust-webbrowser-0.8 (package (name "rust-webbrowser") @@ -78102,8 +89397,223 @@ available on a platform.") using @code{bindgen}.") (license license:mpl2.0))) +(define-public rust-wezterm-bidi-0.2 + (package + (name "rust-wezterm-bidi") + (version "0.2.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "wezterm-bidi" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1v7kwmnxfplv9kgdmamn6csbn2ag5xjr0y6gs797slk0alsnw2hc")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-log" ,rust-log-0.4) + ("rust-wezterm-dynamic" ,rust-wezterm-dynamic-0.2)) + #:cargo-development-inputs (("rust-env-logger" ,rust-env-logger-0.11) + ("rust-k9" ,rust-k9-0.12)))) + (home-page "https://github.com/wez/wezterm") + (synopsis "Unicode Bidi Algorithm") + (description "The Unicode Bidi Algorithm (UBA).") + (license (list license:expat)))) + +(define-public rust-wezterm-blob-leases-0.1 + (package + (name "rust-wezterm-blob-leases") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "wezterm-blob-leases" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "02z6m7p9vf4wvr9g2qv1kxp6zaxxli4ziphhcjbnivbyvw55wnlf")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-getrandom" ,rust-getrandom-0.2) + ("rust-mac-address" ,rust-mac-address-1) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-serde" ,rust-serde-1) + ("rust-sha2" ,rust-sha2-0.10) + ("rust-tempfile" ,rust-tempfile-3) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-uuid" ,rust-uuid-1)))) + (home-page "https://github.com/wez/wezterm") + (synopsis "Image blob caching/leasing for wezterm") + (description "Manage image blob caching/leasing for wezterm.") + (license license:expat))) + +(define-public rust-wezterm-color-types-0.3 + (package + (name "rust-wezterm-color-types") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "wezterm-color-types" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "15j29f60p1dc0msx50x940niyv9d5zpynavpcc6jf44hbkrixs3x")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-csscolorparser" ,rust-csscolorparser-0.6) + ("rust-deltae" ,rust-deltae-0.3) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-serde" ,rust-serde-1) + ("rust-wezterm-dynamic" ,rust-wezterm-dynamic-0.2)))) + (home-page "https://github.com/wez/wezterm") + (synopsis "Types for colors") + (description "This package provides types for working with colors.") + (license license:expat))) + +(define-public rust-wezterm-color-types-0.2 + (package + (inherit rust-wezterm-color-types-0.3) + (name "rust-wezterm-color-types") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "wezterm-color-types" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0xvphmrqgg69v9l879xj5lq010z13f5ixi854ykmny6j7m47lvjc")))) + (arguments + `(#:cargo-inputs (("rust-csscolorparser" ,rust-csscolorparser-0.6) + ("rust-deltae" ,rust-deltae-0.3) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-serde" ,rust-serde-1) + ("rust-wezterm-dynamic" ,rust-wezterm-dynamic-0.1)))))) + +(define-public rust-wezterm-dynamic-0.2 + (package + (name "rust-wezterm-dynamic") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "wezterm-dynamic" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1dbppcd5s509w3b25q2fx2c4c52cwdl61yw1fvh38rx8ryx2icfz")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-log" ,rust-log-0.4) + ("rust-ordered-float" ,rust-ordered-float-4) + ("rust-strsim" ,rust-strsim-0.10) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-wezterm-dynamic-derive" ,rust-wezterm-dynamic-derive-0.1)) + #:cargo-development-inputs (("rust-maplit" ,rust-maplit-1)))) + (home-page "https://github.com/wez/wezterm") + (synopsis "Config serialization for wezterm") + (description + "This package provides configuration serialization for wezterm via dynamic +json-like data values.") + (license license:expat))) + +(define-public rust-wezterm-dynamic-0.1 + (package + (inherit rust-wezterm-dynamic-0.2) + (name "rust-wezterm-dynamic") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "wezterm-dynamic" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1al8fmfr852m62mlcr0v2lg3a18icl2sv79zv7jnv9v0rk07hpm7")))) + (arguments + `(#:cargo-inputs + (("rust-log" ,rust-log-0.4) + ("rust-ordered-float" ,rust-ordered-float-3) + ("rust-strsim" ,rust-strsim-0.10) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-wezterm-dynamic-derive" ,rust-wezterm-dynamic-derive-0.1)) + #:cargo-development-inputs (("rust-maplit" ,rust-maplit-1)))))) + +(define-public rust-wezterm-dynamic-derive-0.1 + (package + (name "rust-wezterm-dynamic-derive") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "wezterm-dynamic-derive" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1w07qf8njyq19nxi9vpshwprk00blhzg9ybis2rhfba433rmx7qc")))) + (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/wez/wezterm") + (synopsis "Config serialization for wezterm") + (description + "This package provides configuration serialization for wezterm via dynamic +json-like data values.") + (license license:expat))) + +(define-public rust-wezterm-input-types-0.1 + (package + (name "rust-wezterm-input-types") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "wezterm-input-types" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0zp557014d458a69yqn9dxfy270b6kyfdiynr5p4algrb7aas4kh")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) + ("rust-euclid" ,rust-euclid-0.22) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-serde" ,rust-serde-1) + ("rust-wezterm-dynamic" ,rust-wezterm-dynamic-0.2)))) + (home-page "https://github.com/wez/wezterm") + (synopsis "Wezterm input types") + (description "Input types for wezterm.") + (license license:expat))) + +(define-public rust-which-6 + (package + (name "rust-which") + (version "6.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "which" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "070hbvl3hjxywychmz7nj5gbsprdm38rir3kqnm48zzp1g0y19bz")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-test-flags '("--release" "--" + "--skip=it_works") + #:cargo-inputs (("rust-either" ,rust-either-1) + ("rust-home" ,rust-home-0.5) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-regex" ,rust-regex-1) + ("rust-rustix" ,rust-rustix-0.38) + ("rust-windows-sys" ,rust-windows-sys-0.52)) + #:cargo-development-inputs (("rust-tempfile" ,rust-tempfile-3)))) + (home-page "https://github.com/harryfei/which-rs.git") + (synopsis "Rust equivalent of @command{which}") + (description + "This package provides a cross-platform Rust equivalent of the +Unix @command{which} command. It returns the full path of an installed +executable.") + (license license:expat))) + (define-public rust-which-5 (package + (inherit rust-which-6) (name "rust-which") (version "5.0.0") (source @@ -78118,7 +89628,6 @@ using @code{bindgen}.") '(begin (substitute* "Cargo.toml" (("\"= *([[:digit:]]+(\\.[[:digit:]]+)*)" _ version) (string-append "\"^" version))))))) - (build-system cargo-build-system) (arguments `(#:cargo-test-flags '("--release" "--" @@ -78130,14 +89639,7 @@ using @code{bindgen}.") ("rust-regex" ,rust-regex-1) ("rust-rustix" ,rust-rustix-0.38) ("rust-windows-sys" ,rust-windows-sys-0.48)) - #:cargo-development-inputs (("rust-tempfile" ,rust-tempfile-3)))) - (home-page "https://github.com/harryfei/which-rs.git") - (synopsis "Rust equivalent of @command{which}") - (description - "This package provides a cross-platform Rust equivalent of the -Unix @command{which} command. It returns the full path of an installed -executable.") - (license license:expat))) + #:cargo-development-inputs (("rust-tempfile" ,rust-tempfile-3)))))) (define-public rust-which-4 (package @@ -78240,21 +89742,20 @@ environment.") (define-public rust-wide-0.7 (package (name "rust-wide") - (version "0.7.4") + (version "0.7.15") (source (origin (method url-fetch) (uri (crate-uri "wide" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0psw31mh21cn4w7i0klsz7law8p8iddsqir8x35cf6n3vb8s5axk")))) + "071cl37d9ni0a4r8y1hjyr5vq0w0w3wf742lqagnfvi49xafrgl9")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-bytemuck" ,rust-bytemuck-1) - ("rust-safe-arch" ,rust-safe-arch-0.6)))) + ("rust-safe-arch" ,rust-safe-arch-0.7)))) (home-page "https://github.com/Lokathor/wide") (synopsis "Rust for wide blocks") (description "This crate has data types for blocks of primitives packed @@ -78360,14 +89861,14 @@ UTF-32 types are provided, including support for malformed encoding.") (define-public rust-wild-2 (package (name "rust-wild") - (version "2.1.0") + (version "2.2.1") (source (origin (method url-fetch) (uri (crate-uri "wild" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0x0a65qrifm3q1gp7cy74qw69nr6zz5k8cqhb8pwbq3bb9l1dc85")))) + (base32 "1q8hnhmv3fvgx0j7bv8qig00599a15mfsdhgx3hq2ljpiky1l4x3")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-glob" ,rust-glob-0.3)) @@ -78379,32 +89880,79 @@ UTF-32 types are provided, including support for malformed encoding.") command-line, uniformly on all platforms") (license (list license:asl2.0 license:expat)))) -(define-public rust-winnow-0.5 +(define-public rust-wildmatch-2 + (package + (name "rust-wildmatch") + (version "2.3.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "wildmatch" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "09dhkskicsyi74abcav57mschy7g16r9ibfsgwsl45bkpk0mk7lk")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-serde" ,rust-serde-1)) + #:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.5) + ("rust-glob" ,rust-glob-0.3) + ("rust-ntest" ,rust-ntest-0.9) + ("rust-rand" ,rust-rand-0.8) + ("rust-regex" ,rust-regex-1) + ("rust-regex-lite" ,rust-regex-lite-0.1)))) + (home-page "https://github.com/becheran/wildmatch") + (synopsis + "String matching with single- and multi-character wildcard operator") + (description "This package provides simple string matching with single- and +multi-character wildcard operator.") + (license license:expat))) + +(define-public rust-winnow-0.6 (package (name "rust-winnow") - (version "0.5.31") + (version "0.6.5") (source (origin (method url-fetch) (uri (crate-uri "winnow" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0734xa05a1x1wg2kcphdhfb39pdcy5qpaf1sjll6qk8kdcp8i94p")))) + (base32 "1f0m48kfdvds456b1i1qd6ia9w3mckk2jf4q6z94snpdcw741ynz")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t ; Cut the dependency graph. - #:cargo-inputs - (("rust-anstream" ,rust-anstream-0.3) - ("rust-anstyle" ,rust-anstyle-1) - ("rust-is-terminal" ,rust-is-terminal-0.4) - ("rust-memchr" ,rust-memchr-2) - ("rust-terminal-size" ,rust-terminal-size-0.2)))) + #:cargo-inputs (("rust-anstream" ,rust-anstream-0.3) + ("rust-anstyle" ,rust-anstyle-1) + ("rust-is-terminal" ,rust-is-terminal-0.4) + ("rust-memchr" ,rust-memchr-2) + ("rust-terminal-size" ,rust-terminal-size-0.2)))) (home-page "https://github.com/winnow-rs/winnow") (synopsis "Byte-oriented, zero-copy, parser combinators library") (description "This package provides a byte-oriented, zero-copy, parser combinators library.") (license license:expat))) +(define-public rust-winnow-0.5 + (package + (inherit rust-winnow-0.6) + (name "rust-winnow") + (version "0.5.40") + (source + (origin + (method url-fetch) + (uri (crate-uri "winnow" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0xk8maai7gyxda673mmw3pj1hdizy5fpi7287vaywykkk19sk4zm")))) + (arguments + `(#:skip-build? #t ; Cut the dependency graph. + #:cargo-inputs + (("rust-anstream" ,rust-anstream-0.3) + ("rust-anstyle" ,rust-anstyle-1) + ("rust-is-terminal" ,rust-is-terminal-0.4) + ("rust-memchr" ,rust-memchr-2) + ("rust-terminal-size" ,rust-terminal-size-0.2)))))) + (define-public rust-winnow-0.4 (package (inherit rust-winnow-0.5) @@ -78598,21 +90146,27 @@ languages.") (define-public rust-xattr-1 (package (name "rust-xattr") - (version "1.0.1") + (version "1.3.1") (source (origin (method url-fetch) (uri (crate-uri "xattr" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "11b93igkwsq88b6m14x63c13zns418njh6ngvg2fbwqzyw4n0s7l")))) + (base32 "0kqxm36w89vc6qcpn6pizlhgjgzq138sx4hdhbv2g6wk4ld4za4d")))) (build-system cargo-build-system) (arguments - `(#:tests? #f ; Tries to access files outside of build environment. + `(#:cargo-test-flags '("--release" "--" + "--skip=test_fd" + "--skip=test_multi" + "--skip=test_path") #:cargo-inputs - (("rust-libc" ,rust-libc-0.2)) + (("rust-libc" ,rust-libc-0.2) + ("rust-linux-raw-sys" ,rust-linux-raw-sys-0.4) + ("rust-rustix" ,rust-rustix-0.38)) #:cargo-development-inputs - (("rust-tempfile" ,rust-tempfile-3)))) + (("rust-rustix" ,rust-rustix-0.38) + ("rust-tempfile" ,rust-tempfile-3)))) (home-page "https://github.com/Stebalien/xattr") (synopsis "Unix extended file system attributes") (description @@ -78938,23 +90492,45 @@ file into an in-memory tree structure.") (define-public rust-xxhash-rust-0.8 (package (name "rust-xxhash-rust") - (version "0.8.2") + (version "0.8.10") (source (origin (method url-fetch) (uri (crate-uri "xxhash-rust" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1v9dk6shls1rsmidf2dxdi3460bn7ingqgvn5mf7prgnxmdy2xg5")))) + (base32 "00zfsfigb6zh0x8aaickkkyd3vyjgnrq36ym04lil7my4lgahzcj")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t)) + `(#:tests? #f ; Only doc tests, which fail. + #:cargo-development-inputs (("rust-getrandom" ,rust-getrandom-0.2) + ("rust-xxhash-c-sys" ,rust-xxhash-c-sys-0.8)))) (home-page "https://github.com/DoumanAsh/xxhash-rust") (synopsis "Implementation of xxHash in Rust") (description "This package provides an implementation of the xxHash algorithm in Rust.") (license license:boost1.0))) +(define-public rust-xxhash-c-sys-0.8 + (package + (name "rust-xxhash-c-sys") + (version "0.8.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "xxhash-c-sys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "13g8cy4w91nwmficbmkrqp40axpwidcna588gzxr47m0ld99jh6j")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-cc" ,rust-cc-1) + ("rust-libc" ,rust-libc-0.2)))) + (home-page "https://github.com/DoumanAsh/xxhash-c-sys") + (synopsis "Bindings to xxhash") + (description "This package provides bindings to xxhash.") + (license license:boost1.0))) + (define-public rust-xz-0.1 (package (name "rust-xz") @@ -78981,7 +90557,7 @@ low-level in-memory encoding/decoding. Alias of @code{xz2} crate.") (define-public rust-xz2-0.1 (package (name "rust-xz2") - (version "0.1.6") + (version "0.1.7") (source (origin (method url-fetch) @@ -78989,17 +90565,20 @@ low-level in-memory encoding/decoding. Alias of @code{xz2} crate.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0v4jb0193gx8s1kvd2ajsgh0ffmwhqhfmrrw1n1h2z7w6jgqcyf1")))) + "1qk7nzpblizvayyq4xzi4b0zacmmbqr6vb9fc0v1avyp17f4931q")))) (build-system cargo-build-system) (arguments - `(#:tests? #f ; Not all files included in the tarball. + `(#:cargo-test-flags + '("--release" "--" + ;; Not all files included in the tarball. + "--skip=standard_files") #:cargo-inputs (("rust-futures" ,rust-futures-0.1) ("rust-lzma-sys" ,rust-lzma-sys-0.1) ("rust-tokio-io" ,rust-tokio-io-0.1)) #:cargo-development-inputs - (("rust-quickcheck" ,rust-quickcheck-0.7) - ("rust-rand" ,rust-rand-0.5) + (("rust-quickcheck" ,rust-quickcheck-1) + ("rust-rand" ,rust-rand-0.8) ("rust-tokio-core" ,rust-tokio-core-0.1)))) (native-inputs (list pkg-config xz)) @@ -79216,6 +90795,28 @@ for locating fonts.") (("rust-const-cstr" ,rust-const-cstr-0.3) ("rust-pkg-config" ,rust-pkg-config-0.3)))))) +(define-public rust-z-base-32-0.1 + (package + (name "rust-z-base-32") + (version "0.1.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "z-base-32" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0fqk028mzvgnx9phqzvhzrx3fbzv4r736cm3x3hid136g157pgr1")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-anyhow" ,rust-anyhow-1) + ("rust-clap" ,rust-clap-4) + ("rust-pyo3" ,rust-pyo3-0.20)) + #:cargo-development-inputs (("rust-quickcheck" ,rust-quickcheck-1)))) + (home-page "https://github.com/matusf/z-base-32") + (synopsis "Human-oriented base-32 encoding") + (description "This package provides human-oriented base-32 encoding.") + (license license:expat))) + (define-public rust-zbase32-0.1 (package (name "rust-zbase32") @@ -79455,7 +91056,12 @@ for locating fonts.") (uri (crate-uri "zerocopy" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1ghnfxw69kx5d1aqfd5fsfrra9dgpz17yqx84nd4ryjk3sbd7m3l")))) + (base32 "1ghnfxw69kx5d1aqfd5fsfrra9dgpz17yqx84nd4ryjk3sbd7m3l")) + (modules '((guix build utils))) + (snippet + '(begin (substitute* "Cargo.toml" + (("\"= ?([[:digit:]]+(\\.[[:digit:]]+)*)" _ version) + (string-append "\"^" version))))))) (build-system cargo-build-system) (arguments `(#:tests? #f ; use of undeclared crate or module `testutil` @@ -79521,7 +91127,12 @@ for locating fonts.") (uri (crate-uri "zerocopy-derive" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "19nj11md42aijyqnfx8pa647fjzhz537xyc624rajwwfrn6b3qcw")))) + (base32 "19nj11md42aijyqnfx8pa647fjzhz537xyc624rajwwfrn6b3qcw")) + (modules '((guix build utils))) + (snippet + '(begin (substitute* "Cargo.toml" + (("\"= ?([[:digit:]]+(\\.[[:digit:]]+)*)" _ version) + (string-append "\"^" version))))))) (build-system cargo-build-system) (arguments `(#:tests? #f ; unresolved import `zerocopy` @@ -79666,6 +91277,8 @@ implementation that works everywhere, even WASM!") ("rust-getrandom" ,rust-getrandom-0.2) ("rust-time" ,rust-time-0.3) ("rust-walkdir" ,rust-walkdir-2)))) + (native-inputs (list pkg-config)) + (inputs (list (list zstd "lib"))) (home-page "https://github.com/zip-rs/zip") (synopsis "Library to support the reading and writing of zip files") @@ -79695,7 +91308,9 @@ implementation that works everywhere, even WASM!") ("rust-crc32fast" ,rust-crc32fast-1) ("rust-flate2" ,rust-flate2-1) ("rust-thiserror" ,rust-thiserror-1) - ("rust-time" ,rust-time-0.1)))))) + ("rust-time" ,rust-time-0.1)))) + (native-inputs '()) + (inputs '()))) (define-public rust-zoneinfo-compiled-0.5 (package @@ -79740,6 +91355,8 @@ implementation that works everywhere, even WASM!") ("rust-humansize" ,rust-humansize-2) ("rust-partial-io" ,rust-partial-io-0.5) ("rust-walkdir" ,rust-walkdir-2)))) + (native-inputs (list pkg-config)) + (inputs (list (list zstd "lib"))) (home-page "https://github.com/gyscos/zstd-rs") (synopsis "Binding to the zstd compression library") (description @@ -79816,7 +91433,9 @@ implementation that works everywhere, even WASM!") (("rust-clap" ,rust-clap-3) ("rust-humansize" ,rust-humansize-1) ("rust-partial-io" ,rust-partial-io-0.5) - ("rust-walkdir" ,rust-walkdir-2)))))) + ("rust-walkdir" ,rust-walkdir-2)))) + (native-inputs '()) + (inputs '()))) (define-public rust-zstd-safe-7 (package @@ -79832,6 +91451,8 @@ implementation that works everywhere, even WASM!") (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-zstd-sys" ,rust-zstd-sys-2)))) + (native-inputs (list pkg-config)) + (inputs (list (list zstd "lib"))) (home-page "https://github.com/gyscos/zstd-rs") (synopsis "Safe low-level bindings to the zstd compression library") (description @@ -79888,31 +91509,31 @@ library.") (arguments `(#:cargo-inputs (("rust-libc" ,rust-libc-0.2) - ("rust-zstd-sys" ,rust-zstd-sys-1)))))) + ("rust-zstd-sys" ,rust-zstd-sys-1)))) + (native-inputs '()) + (inputs '()))) -;; TODO: Unbundle zstd. -;; The 'legacy' feature, enabled by default, needs headers which aren't -;; installed by default in zstd. (define-public rust-zstd-sys-2 (package (name "rust-zstd-sys") - (version "2.0.8+zstd.1.5.5") + (version "2.0.10+zstd.1.5.6") (source (origin (method url-fetch) (uri (crate-uri "zstd-sys" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "137c0wkxb04l0ig5df8a1ni94dl0g2ibz2q9dicg4bfk4ppfcmjm")))) + (base32 "1ak51pq1ni6q3qgyr58iq1pcz0vyh80f8vn8m27zrfpm9a8s8ly2")) + (snippet #~(begin + (use-modules (guix build utils)) + (delete-file-recursively "zstd"))))) (build-system cargo-build-system) (arguments - `(#:install-source? #f ; invalid inclusion of reserved file name - #:cargo-inputs - (("rust-bindgen" ,rust-bindgen-0.64) - ("rust-cc" ,rust-cc-1) - ("rust-libc" ,rust-libc-0.2) - ("rust-pkg-config" ,rust-pkg-config-0.3)))) + `(#:cargo-inputs (("rust-bindgen" ,rust-bindgen-0.69) + ("rust-cc" ,rust-cc-1) + ("rust-pkg-config" ,rust-pkg-config-0.3)))) + (native-inputs (list pkg-config)) + (inputs (list (list zstd "lib"))) (home-page "https://github.com/gyscos/zstd-rs") (synopsis "Low-level bindings to the zstd compression library") (description "This package provides low-level Rust bindings to the zstd diff --git a/gnu/packages/crates-tls.scm b/gnu/packages/crates-tls.scm index ee061cedcf..61ce82cda8 100644 --- a/gnu/packages/crates-tls.scm +++ b/gnu/packages/crates-tls.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2020 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2020 Valentin Ignatev <valentignatev@gmail.com> ;;; Copyright © 2020, 2023, 2024 Efraim Flashner <efraim@flashner.co.il> -;;; Copyright © 2020, 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr> +;;; Copyright © 2020, 2021, 2024 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2021 Alexandru-Sergiu Marton <brown121407@posteo.ro> ;;; Copyright © 2022 Aleksandr Vityazev <avityazev@posteo.org> ;;; Copyright © 2022 Ricardo Wurmus <rekado@elephly.net> @@ -424,18 +424,19 @@ Google @code{BoringSSL} project and the @code{OpenSSL} project.") (define-public rust-der-0.7 (package (name "rust-der") - (version "0.7.5") + (version "0.7.8") (source (origin (method url-fetch) (uri (crate-uri "der" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "06f2clallhpjc51s3dc7mpcw5ms3jak727qc5yrfg3ncrpzqvr85")))) + "070bwiyr80800h31c5zd96ckkgagfjgnrrdmz3dzg2lccsd3dypz")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-arbitrary" ,rust-arbitrary-1) + ("rust-bytes" ,rust-bytes-1) ("rust-const-oid" ,rust-const-oid-0.9) ("rust-der-derive" ,rust-der-derive-0.7) ("rust-flagset" ,rust-flagset-0.4) @@ -523,14 +524,14 @@ targets") (define-public rust-der-derive-0.7 (package (name "rust-der-derive") - (version "0.7.1") + (version "0.7.2") (source (origin (method url-fetch) (uri (crate-uri "der_derive" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0cmyza28s52wfb67ymydjmvsc4m3sfp98dv9vprx6ibmdfx94iqi")))) + "0jg0y3k46bpygwc5cqha07axz5sdnsx5116g3nxf0rwrabj7rs2z")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -1451,18 +1452,22 @@ PEM-encodings commonly used to store keys and certificates at rest.") (define-public rust-rustls-pki-types-1 (package (name "rust-rustls-pki-types") - (version "1.0.1") + (version "1.7.0") (source (origin (method url-fetch) (uri (crate-uri "rustls-pki-types" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "16rkx6gn5l2zximxy8fx9h2vzks1hfxi5z5cd9y97r0fl853wrz7")))) + (base32 "0banlc9xzwqrx8n0h4bd0igmq3z5hc72rn941lf22cp3gkkraqlp")))) (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-web-time" ,rust-web-time-1)))) (home-page "https://github.com/rustls/pki-types") (synopsis "Shared types for the rustls PKI ecosystem") - (description "Shared types for the rustls PKI ecosystem.") + (description + "This crate provides shared types for the rustls PKI ecosystem.") (license (list license:expat license:asl2.0)))) (define-public rust-rustls-webpki-0.102 @@ -1578,6 +1583,42 @@ PEM-encodings commonly used to store keys and certificates at rest.") (description "This package provides a Rust parser for the TLS protocol.") (license (list license:expat license:asl2.0)))) +(define-public rust-x509-cert-0.2 + (package + (name "rust-x509-cert") + (version "0.2.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "x509-cert" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "155f42vm6m7phn8w7s2wmk9vli3ws45dqpk5z3jilw0a04syj08k")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-arbitrary" ,rust-arbitrary-1) + ("rust-const-oid" ,rust-const-oid-0.9) + ("rust-der" ,rust-der-0.7) + ("rust-sha1" ,rust-sha1-0.10) + ("rust-signature" ,rust-signature-2) + ("rust-spki" ,rust-spki-0.7) + ("rust-tls-codec" ,rust-tls-codec-0.4)) + #:cargo-development-inputs + (("rust-ecdsa" ,rust-ecdsa-0.16) + ("rust-hex-literal" ,rust-hex-literal-0.4) + ("rust-p256" ,rust-p256-0.13) + ("rust-rand" ,rust-rand-0.8) + ("rust-rsa" ,rust-rsa-0.9) + ("rust-rstest" ,rust-rstest-0.18) + ("rust-sha2" ,rust-sha2-0.10) + ("rust-tempfile" ,rust-tempfile-3)))) + (home-page "https://github.com/RustCrypto/formats/tree/master/x509-cert") + (synopsis "X.509 Public Key Infrastructure Certificate format in Rust") + (description + "This package provides a pure Rust implementation of the X.509 +Public Key Infrastructure Certificate format as described in RFC 5280.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-x509-parser-0.15 (package (name "rust-x509-parser") diff --git a/gnu/packages/crates-vcs.scm b/gnu/packages/crates-vcs.scm index 6a3ff50edb..e6aa0ddf10 100644 --- a/gnu/packages/crates-vcs.scm +++ b/gnu/packages/crates-vcs.scm @@ -44,6 +44,52 @@ #:use-module (gnu packages tls) #:use-module (gnu packages version-control)) +(define-public rust-asyncgit-0.25 + (package + (name "rust-asyncgit") + (version "0.25.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "asyncgit" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "05qlwp63k5zd4yd7n18v6bs32fhbx5qlsc98j203maacy0vlm9h7")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-test-flags '("--release" "--" + "--skip" "reject_in_subfolder" ; /bin/sh + "--skip" "test_pre_commit_workdir" ; /bin/sh + "--skip" "sync::submodules::tests::test_smoke") ; network + #:cargo-inputs (("rust-bitflags" ,rust-bitflags-2) + ("rust-crossbeam-channel" ,rust-crossbeam-channel-0.5) + ("rust-easy-cast" ,rust-easy-cast-0.5) + ("rust-fuzzy-matcher" ,rust-fuzzy-matcher-0.3) + ("rust-git2" ,rust-git2-0.18) + ("rust-git2-hooks" ,rust-git2-hooks-0.3) + ("rust-log" ,rust-log-0.4) + ("rust-openssl-sys" ,rust-openssl-sys-0.9) + ("rust-rayon" ,rust-rayon-1) + ("rust-rayon-core" ,rust-rayon-core-1) + ("rust-scopetime" ,rust-scopetime-0.1) + ("rust-serde" ,rust-serde-1) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-unicode-truncate" ,rust-unicode-truncate-0.2) + ("rust-url" ,rust-url-2)) + #:cargo-development-inputs + (("rust-env-logger" ,rust-env-logger-0.11) + ("rust-invalidstring" ,rust-invalidstring-0.1) + ("rust-pretty-assertions" ,rust-pretty-assertions-1) + ("rust-serial-test" ,rust-serial-test-3) + ("rust-tempfile" ,rust-tempfile-3)))) + (native-inputs (list pkg-config git-minimal)) + (inputs (list libgit2-1.7 libssh2 openssl zlib)) + (home-page "https://github.com/extrawurst/gitui") + (synopsis "Use git2 in an asynchronous context") + (description + "This package provides for using git2 in an asynchronous context.") + (license license:expat))) + (define-public rust-git-testament-0.2 (package (name "rust-git-testament") @@ -170,14 +216,14 @@ dirty state into your program.") (define-public rust-git2-0.18 (package (name "rust-git2") - (version "0.18.1") + (version "0.18.3") (source (origin (method url-fetch) (uri (crate-uri "git2" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1kf0kvg3i7p1223zs2h9fz99ndm0l9kdx3hcw63g73dh5nlppygv")))) + (base32 "0w7gcq6v9kdlh0vcv27xrk09c1bhkarqhnp52pvnnximzrxnlbi3")))) (build-system cargo-build-system) (arguments `(#:cargo-test-flags (list "--release" "--" @@ -189,7 +235,7 @@ dirty state into your program.") ("rust-openssl-probe" ,rust-openssl-probe-0.1) ("rust-openssl-sys" ,rust-openssl-sys-0.9) ("rust-url" ,rust-url-2)) - #:cargo-development-inputs (("rust-structopt" ,rust-structopt-0.3) + #:cargo-development-inputs (("rust-clap" ,rust-clap-4) ("rust-tempfile" ,rust-tempfile-3) ("rust-time" ,rust-time-0.1)))) (native-inputs (list pkg-config)) @@ -421,8 +467,198 @@ libcurl, which is intended to be used with the @code{git2} crate.") ("rust-log" ,rust-log-0.4) ("rust-url" ,rust-url-2)))))) +(define-public rust-git2-hooks-0.3 + (package + (name "rust-git2-hooks") + (version "0.3.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "git2-hooks" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1grq79ggjp2b10yxl205kjkfqcijmmncnf47az3g1g713irpzgwx")))) + (native-inputs (list pkg-config)) + (inputs (list libgit2-1.7 libssh2 openssl zlib)) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; missing git2_testing + #:cargo-inputs (("rust-git2" ,rust-git2-0.17) + ("rust-log" ,rust-log-0.4) + ("rust-shellexpand" ,rust-shellexpand-3) + ("rust-thiserror" ,rust-thiserror-1)) + #:cargo-development-inputs + (("rust-pretty-assertions" ,rust-pretty-assertions-1) + ("rust-tempfile" ,rust-tempfile-3)))) + (home-page "https://github.com/extrawurst/gitui") + (synopsis "Git hooks") + (description "This crate adds git hooks support based on git2-rs.") + (license license:expat))) + +(define-public rust-gix-0.57 + (package + (name "rust-gix") + (version "0.57.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "gix" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0pnprvkywvzqqzlm5zsawjzjx71zh36q45ffm40bbiwj50w2bl3d")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-async-std" ,rust-async-std-1) + ("rust-curl" ,rust-curl-0.4) + ("rust-document-features" ,rust-document-features-0.2) + ("rust-gix-actor" ,rust-gix-actor-0.29) + ("rust-gix-archive" ,rust-gix-archive-0.8) + ("rust-gix-attributes" ,rust-gix-attributes-0.21) + ("rust-gix-command" ,rust-gix-command-0.3) + ("rust-gix-commitgraph" ,rust-gix-commitgraph-0.23) + ("rust-gix-config" ,rust-gix-config-0.33) + ("rust-gix-credentials" ,rust-gix-credentials-0.23) + ("rust-gix-date" ,rust-gix-date-0.8) + ("rust-gix-diff" ,rust-gix-diff-0.39) + ("rust-gix-discover" ,rust-gix-discover-0.28) + ("rust-gix-features" ,rust-gix-features-0.37) + ("rust-gix-filter" ,rust-gix-filter-0.8) + ("rust-gix-fs" ,rust-gix-fs-0.9) + ("rust-gix-glob" ,rust-gix-glob-0.15) + ("rust-gix-hash" ,rust-gix-hash-0.14) + ("rust-gix-hashtable" ,rust-gix-hashtable-0.5) + ("rust-gix-ignore" ,rust-gix-ignore-0.10) + ("rust-gix-index" ,rust-gix-index-0.28) + ("rust-gix-lock" ,rust-gix-lock-12) + ("rust-gix-macros" ,rust-gix-macros-0.1) + ("rust-gix-mailmap" ,rust-gix-mailmap-0.21) + ("rust-gix-negotiate" ,rust-gix-negotiate-0.11) + ("rust-gix-object" ,rust-gix-object-0.40) + ("rust-gix-odb" ,rust-gix-odb-0.56) + ("rust-gix-pack" ,rust-gix-pack-0.46) + ("rust-gix-path" ,rust-gix-path-0.10) + ("rust-gix-pathspec" ,rust-gix-pathspec-0.5) + ("rust-gix-prompt" ,rust-gix-prompt-0.8) + ("rust-gix-protocol" ,rust-gix-protocol-0.43) + ("rust-gix-ref" ,rust-gix-ref-0.40) + ("rust-gix-refspec" ,rust-gix-refspec-0.21) + ("rust-gix-revision" ,rust-gix-revision-0.25) + ("rust-gix-revwalk" ,rust-gix-revwalk-0.11) + ("rust-gix-sec" ,rust-gix-sec-0.10) + ("rust-gix-status" ,rust-gix-status-0.4) + ("rust-gix-submodule" ,rust-gix-submodule-0.7) + ("rust-gix-tempfile" ,rust-gix-tempfile-12) + ("rust-gix-trace" ,rust-gix-trace-0.1) + ("rust-gix-transport" ,rust-gix-transport-0.40) + ("rust-gix-traverse" ,rust-gix-traverse-0.36) + ("rust-gix-url" ,rust-gix-url-0.26) + ("rust-gix-utils" ,rust-gix-utils-0.1) + ("rust-gix-validate" ,rust-gix-validate-0.8) + ("rust-gix-worktree" ,rust-gix-worktree-0.29) + ("rust-gix-worktree-state" ,rust-gix-worktree-state-0.6) + ("rust-gix-worktree-stream" ,rust-gix-worktree-stream-0.8) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-parking-lot" ,rust-parking-lot-0.12) + ("rust-prodash" ,rust-prodash-28) + ("rust-regex" ,rust-regex-1) + ("rust-reqwest" ,rust-reqwest-0.11) + ("rust-serde" ,rust-serde-1) + ("rust-signal-hook" ,rust-signal-hook-0.3) + ("rust-smallvec" ,rust-smallvec-1) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-unicode-normalization" ,rust-unicode-normalization-0.1)) + #:cargo-development-inputs (("rust-anyhow" ,rust-anyhow-1) + ("rust-async-std" ,rust-async-std-1) + ("rust-is-ci" ,rust-is-ci-1) + ("rust-serial-test" ,rust-serial-test-2) + ("rust-walkdir" ,rust-walkdir-2)))) + (home-page "https://github.com/Byron/gitoxide") + (synopsis "Interact with Git repositories using a pure Rust implementation") + (description "Gitoxide is a pure Rust implementation of Git that aims to be lean +and correct. Interact with Git repositories just like Git would.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-gix-0.56 + (package + (inherit rust-gix-0.57) + (name "rust-gix") + (version "0.56.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "gix" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1jqq0vl71qdphspdkcanjkwp4pk35bmafh7sjxc56rhdqv4ws3av")))) + (arguments + `(#:cargo-inputs (("rust-async-std" ,rust-async-std-1) + ("rust-curl" ,rust-curl-0.4) + ("rust-document-features" ,rust-document-features-0.2) + ("rust-gix-actor" ,rust-gix-actor-0.28) + ("rust-gix-archive" ,rust-gix-archive-0.7) + ("rust-gix-attributes" ,rust-gix-attributes-0.20) + ("rust-gix-command" ,rust-gix-command-0.3) + ("rust-gix-commitgraph" ,rust-gix-commitgraph-0.22) + ("rust-gix-config" ,rust-gix-config-0.32) + ("rust-gix-credentials" ,rust-gix-credentials-0.22) + ("rust-gix-date" ,rust-gix-date-0.8) + ("rust-gix-diff" ,rust-gix-diff-0.38) + ("rust-gix-discover" ,rust-gix-discover-0.27) + ("rust-gix-features" ,rust-gix-features-0.36) + ("rust-gix-filter" ,rust-gix-filter-0.7) + ("rust-gix-fs" ,rust-gix-fs-0.8) + ("rust-gix-glob" ,rust-gix-glob-0.14) + ("rust-gix-hash" ,rust-gix-hash-0.13) + ("rust-gix-hashtable" ,rust-gix-hashtable-0.4) + ("rust-gix-ignore" ,rust-gix-ignore-0.9) + ("rust-gix-index" ,rust-gix-index-0.27) + ("rust-gix-lock" ,rust-gix-lock-11) + ("rust-gix-macros" ,rust-gix-macros-0.1) + ("rust-gix-mailmap" ,rust-gix-mailmap-0.20) + ("rust-gix-negotiate" ,rust-gix-negotiate-0.10) + ("rust-gix-object" ,rust-gix-object-0.39) + ("rust-gix-odb" ,rust-gix-odb-0.55) + ("rust-gix-pack" ,rust-gix-pack-0.45) + ("rust-gix-path" ,rust-gix-path-0.10) + ("rust-gix-pathspec" ,rust-gix-pathspec-0.4) + ("rust-gix-prompt" ,rust-gix-prompt-0.8) + ("rust-gix-protocol" ,rust-gix-protocol-0.42) + ("rust-gix-ref" ,rust-gix-ref-0.39) + ("rust-gix-refspec" ,rust-gix-refspec-0.20) + ("rust-gix-revision" ,rust-gix-revision-0.24) + ("rust-gix-revwalk" ,rust-gix-revwalk-0.10) + ("rust-gix-sec" ,rust-gix-sec-0.10) + ("rust-gix-status" ,rust-gix-status-0.3) + ("rust-gix-submodule" ,rust-gix-submodule-0.6) + ("rust-gix-tempfile" ,rust-gix-tempfile-11) + ("rust-gix-trace" ,rust-gix-trace-0.1) + ("rust-gix-transport" ,rust-gix-transport-0.39) + ("rust-gix-traverse" ,rust-gix-traverse-0.35) + ("rust-gix-url" ,rust-gix-url-0.25) + ("rust-gix-utils" ,rust-gix-utils-0.1) + ("rust-gix-validate" ,rust-gix-validate-0.8) + ("rust-gix-worktree" ,rust-gix-worktree-0.28) + ("rust-gix-worktree-state" ,rust-gix-worktree-state-0.5) + ("rust-gix-worktree-stream" ,rust-gix-worktree-stream-0.7) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-parking-lot" ,rust-parking-lot-0.12) + ("rust-prodash" ,rust-prodash-26) + ("rust-regex" ,rust-regex-1) + ("rust-reqwest" ,rust-reqwest-0.11) + ("rust-serde" ,rust-serde-1) + ("rust-signal-hook" ,rust-signal-hook-0.3) + ("rust-smallvec" ,rust-smallvec-1) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-unicode-normalization" ,rust-unicode-normalization-0.1)) + #:cargo-development-inputs (("rust-anyhow" ,rust-anyhow-1) + ("rust-async-std" ,rust-async-std-1) + ("rust-is-ci" ,rust-is-ci-1) + ("rust-serial-test" ,rust-serial-test-2) + ("rust-walkdir" ,rust-walkdir-2)))))) + (define-public rust-gix-0.55 (package + (inherit rust-gix-0.56) (name "rust-gix") (version "0.55.2") (source @@ -432,7 +668,6 @@ libcurl, which is intended to be used with the @code{git2} crate.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "1spf1hgpbn76y2am0q4i1qxwy8987g9f7byhs09r6y5v3v6nf9h0")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-async-std" ,rust-async-std-1) ("rust-document-features" ,rust-document-features-0.2) @@ -495,12 +730,7 @@ libcurl, which is intended to be used with the @code{git2} crate.") ("rust-async-std" ,rust-async-std-1) ("rust-is-ci" ,rust-is-ci-1) ("rust-serial-test" ,rust-serial-test-2) - ("rust-walkdir" ,rust-walkdir-2)))) - (home-page "https://github.com/Byron/gitoxide") - (synopsis "Interact with Git repositories using a pure Rust implementation") - (description "Gitoxide is a pure Rust implementation of Git that aims to be lean -and correct. Interact with Git repositories just like Git would.") - (license (list license:expat license:asl2.0)))) + ("rust-walkdir" ,rust-walkdir-2)))))) (define-public rust-gix-0.54 (package @@ -647,17 +877,17 @@ and correct. Interact with Git repositories just like Git would.") ("rust-serial-test" ,rust-serial-test-2) ("rust-walkdir" ,rust-walkdir-2)))))) -(define-public rust-gix-actor-0.28 +(define-public rust-gix-actor-0.29 (package (name "rust-gix-actor") - (version "0.28.1") + (version "0.29.1") (source (origin (method url-fetch) (uri (crate-uri "gix-actor" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "05xldn3aq58kjx2i87xsb2gdw7qhxvvikyvsiwvv85ppkq1cmb9f")))) + (base32 "0n6rq4nln61kvppz304llwl3ricckx04ikfwj7w5zixm9amva9ys")))) (build-system cargo-build-system) (arguments `(#:tests? #f ; use of undeclared crate or module `gix_testtools` @@ -665,18 +895,45 @@ and correct. Interact with Git repositories just like Git would.") ("rust-btoi" ,rust-btoi-0.4) ("rust-document-features" ,rust-document-features-0.2) ("rust-gix-date" ,rust-gix-date-0.8) - ("rust-gix-features" ,rust-gix-features-0.36) + ("rust-gix-features" ,rust-gix-features-0.37) ("rust-itoa" ,rust-itoa-1) ("rust-serde" ,rust-serde-1) ("rust-thiserror" ,rust-thiserror-1) ("rust-winnow" ,rust-winnow-0.5)) - #:cargo-development-inputs (("rust-pretty-assertions" ,rust-pretty-assertions-1)))) + #:cargo-development-inputs + (("rust-pretty-assertions" ,rust-pretty-assertions-1)))) (home-page "https://github.com/Byron/gitoxide") (synopsis "Part of Gitoxide, a way to identify Git actors") (description "Part of Gitoxide, a pure Rust implementation of Git. This package provides a way to identify Git actors.") (license (list license:expat license:asl2.0)))) +(define-public rust-gix-actor-0.28 + (package + (inherit rust-gix-actor-0.29) + (name "rust-gix-actor") + (version "0.28.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "gix-actor" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "05xldn3aq58kjx2i87xsb2gdw7qhxvvikyvsiwvv85ppkq1cmb9f")))) + (arguments + `(#:tests? #f ; use of undeclared crate or module `gix_testtools` + #:cargo-inputs (("rust-bstr" ,rust-bstr-1) + ("rust-btoi" ,rust-btoi-0.4) + ("rust-document-features" ,rust-document-features-0.2) + ("rust-gix-date" ,rust-gix-date-0.8) + ("rust-gix-features" ,rust-gix-features-0.36) + ("rust-itoa" ,rust-itoa-1) + ("rust-serde" ,rust-serde-1) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-winnow" ,rust-winnow-0.5)) + #:cargo-development-inputs + (("rust-pretty-assertions" ,rust-pretty-assertions-1)))))) + (define-public rust-gix-actor-0.27 (package (inherit rust-gix-actor-0.28) @@ -731,27 +988,26 @@ package provides a way to identify Git actors.") #:cargo-development-inputs (("rust-pretty-assertions" ,rust-pretty-assertions-1)))))) -(define-public rust-gix-archive-0.6 +(define-public rust-gix-archive-0.8 (package (name "rust-gix-archive") - (version "0.6.0") + (version "0.8.1") (source (origin (method url-fetch) (uri (crate-uri "gix-archive" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "17gh1wzs1jrmywbchrqdmkma2c0saik7k52fralfdfkf6hbq97wh")))) + (base32 "04yz6382qx6r6g1x2czvpz80ympa33mg3ihkmdf2mcahmgc1mz8w")))) (build-system cargo-build-system) (arguments - `(#:tests? #f ; use of undeclared crate or module `gix_attributes` - #:cargo-inputs (("rust-bstr" ,rust-bstr-1) + `(#:cargo-inputs (("rust-bstr" ,rust-bstr-1) ("rust-document-features" ,rust-document-features-0.2) ("rust-flate2" ,rust-flate2-1) ("rust-gix-date" ,rust-gix-date-0.8) - ("rust-gix-object" ,rust-gix-object-0.38) + ("rust-gix-object" ,rust-gix-object-0.40) ("rust-gix-path" ,rust-gix-path-0.10) - ("rust-gix-worktree-stream" ,rust-gix-worktree-stream-0.6) + ("rust-gix-worktree-stream" ,rust-gix-worktree-stream-0.8) ("rust-tar" ,rust-tar-0.4) ("rust-thiserror" ,rust-thiserror-1) ("rust-time" ,rust-time-0.3) @@ -762,6 +1018,57 @@ package provides a way to identify Git actors.") Rust implementation of Git.") (license (list license:expat license:asl2.0)))) +(define-public rust-gix-archive-0.7 + (package + (inherit rust-gix-archive-0.8) + (name "rust-gix-archive") + (version "0.7.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "gix-archive" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0f6c5qmf905wm1fp0ra255925avzwgvp7p2rrpqnk4xwiidhklf9")))) + (arguments + `(#:cargo-inputs (("rust-bstr" ,rust-bstr-1) + ("rust-document-features" ,rust-document-features-0.2) + ("rust-flate2" ,rust-flate2-1) + ("rust-gix-date" ,rust-gix-date-0.8) + ("rust-gix-object" ,rust-gix-object-0.39) + ("rust-gix-path" ,rust-gix-path-0.10) + ("rust-gix-worktree-stream" ,rust-gix-worktree-stream-0.7) + ("rust-tar" ,rust-tar-0.4) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-time" ,rust-time-0.3) + ("rust-zip" ,rust-zip-0.6)))))) + +(define-public rust-gix-archive-0.6 + (package + (inherit rust-gix-archive-0.7) + (name "rust-gix-archive") + (version "0.6.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "gix-archive" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "17gh1wzs1jrmywbchrqdmkma2c0saik7k52fralfdfkf6hbq97wh")))) + (arguments + `(#:tests? #f ; use of undeclared crate or module `gix_attributes` + #:cargo-inputs (("rust-bstr" ,rust-bstr-1) + ("rust-document-features" ,rust-document-features-0.2) + ("rust-flate2" ,rust-flate2-1) + ("rust-gix-date" ,rust-gix-date-0.8) + ("rust-gix-object" ,rust-gix-object-0.38) + ("rust-gix-path" ,rust-gix-path-0.10) + ("rust-gix-worktree-stream" ,rust-gix-worktree-stream-0.6) + ("rust-tar" ,rust-tar-0.4) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-time" ,rust-time-0.3) + ("rust-zip" ,rust-zip-0.6)))))) + (define-public rust-gix-archive-0.5 (package (inherit rust-gix-archive-0.6) @@ -788,22 +1095,22 @@ Rust implementation of Git.") ("rust-time" ,rust-time-0.3) ("rust-zip" ,rust-zip-0.6)))))) -(define-public rust-gix-attributes-0.20 +(define-public rust-gix-attributes-0.21 (package (name "rust-gix-attributes") - (version "0.20.1") + (version "0.21.1") (source (origin (method url-fetch) (uri (crate-uri "gix-attributes" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "109kciz3cssfbx9zgslngdrkzwf3zd9mlv0srm3yqxlcsdlm8f8g")))) + (base32 "066y16rw994wrvvhv1xwf5gnc51bh727jxyql7wzrkkb7mhffvdx")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-bstr" ,rust-bstr-1) ("rust-document-features" ,rust-document-features-0.2) - ("rust-gix-glob" ,rust-gix-glob-0.14) + ("rust-gix-glob" ,rust-gix-glob-0.15) ("rust-gix-path" ,rust-gix-path-0.10) ("rust-gix-quote" ,rust-gix-quote-0.4) ("rust-gix-trace" ,rust-gix-trace-0.1) @@ -819,6 +1126,31 @@ Rust implementation of Git.") @code{.gitattributes} files.") (license (list license:expat license:asl2.0)))) +(define-public rust-gix-attributes-0.20 + (package + (inherit rust-gix-attributes-0.21) + (name "rust-gix-attributes") + (version "0.20.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "gix-attributes" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "109kciz3cssfbx9zgslngdrkzwf3zd9mlv0srm3yqxlcsdlm8f8g")))) + (arguments + `(#:cargo-inputs (("rust-bstr" ,rust-bstr-1) + ("rust-document-features" ,rust-document-features-0.2) + ("rust-gix-glob" ,rust-gix-glob-0.14) + ("rust-gix-path" ,rust-gix-path-0.10) + ("rust-gix-quote" ,rust-gix-quote-0.4) + ("rust-gix-trace" ,rust-gix-trace-0.1) + ("rust-kstring" ,rust-kstring-2) + ("rust-serde" ,rust-serde-1) + ("rust-smallvec" ,rust-smallvec-1) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-unicode-bom" ,rust-unicode-bom-2)))))) + (define-public rust-gix-attributes-0.19 (package (inherit rust-gix-attributes-0.20) @@ -873,14 +1205,14 @@ Rust implementation of Git.") (define-public rust-gix-bitmap-0.2 (package (name "rust-gix-bitmap") - (version "0.2.10") + (version "0.2.11") (source (origin (method url-fetch) (uri (crate-uri "gix-bitmap" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "09bk3y4mb4zpncqv07mj6n0if69g245b1jgsv96h70314h7wvdkq")))) + (base32 "1bl7gqqlsdwngvvpgj6cby07cwidf7m0yk6wv473zqflrdkdnwd3")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-thiserror" ,rust-thiserror-1)))) @@ -894,14 +1226,14 @@ implementing the standard git bitmap format.") (define-public rust-gix-chunk-0.4 (package (name "rust-gix-chunk") - (version "0.4.7") + (version "0.4.8") (source (origin (method url-fetch) (uri (crate-uri "gix-chunk" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0y2wp3clilp5rdl727x4q4qw1chbgq91l9spq6h7d07nmkgccgh0")))) + (base32 "0lhcmzamr5rlcw8h9bvsjqn9dak1mwj3ng2i1djaf6wnd48pbj25")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-thiserror" ,rust-thiserror-1)))) @@ -912,21 +1244,24 @@ implementing the standard git bitmap format.") commit-graph files.") (license (list license:expat license:asl2.0)))) -(define-public rust-gix-command-0.2 +(define-public rust-gix-command-0.3 (package (name "rust-gix-command") - (version "0.2.10") + (version "0.3.6") (source (origin (method url-fetch) (uri (crate-uri "gix-command" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1ix44maislxlranv67yw5fan5k82lpgax22zgc4jrxvpypxnqmrw")))) + (base32 "0xsbllakppwpn3z5qzyivlqa7q068wry2a7dpr3xxcy41l10j07r")))) (build-system cargo-build-system) (arguments `(#:tests? #f ; use of undeclared crate or module `gix_testtools` - #:cargo-inputs (("rust-bstr" ,rust-bstr-1)))) + #:cargo-inputs (("rust-bstr" ,rust-bstr-1) + ("rust-gix-path" ,rust-gix-path-0.10) + ("rust-gix-trace" ,rust-gix-trace-0.1) + ("rust-shell-words" ,rust-shell-words-1)))) (home-page "https://github.com/Byron/gitoxide") (synopsis "Handle internal git command execution") (description @@ -934,24 +1269,40 @@ commit-graph files.") command execution.") (license (list license:expat license:asl2.0)))) -(define-public rust-gix-commitgraph-0.22 +(define-public rust-gix-command-0.2 + (package + (inherit rust-gix-command-0.3) + (name "rust-gix-command") + (version "0.2.10") + (source + (origin + (method url-fetch) + (uri (crate-uri "gix-command" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1ix44maislxlranv67yw5fan5k82lpgax22zgc4jrxvpypxnqmrw")))) + (arguments + `(#:tests? #f ; use of undeclared crate or module `gix_testtools` + #:cargo-inputs (("rust-bstr" ,rust-bstr-1)))))) + +(define-public rust-gix-commitgraph-0.23 (package (name "rust-gix-commitgraph") - (version "0.22.1") + (version "0.23.2") (source (origin (method url-fetch) (uri (crate-uri "gix-commitgraph" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0dpcdj9s5pkdvqpc22jm42y2lhkji2jgixps7a05kw11l1xh19w5")))) + (base32 "1z0hn19phbwcwmvp6mn21pvmlq92jyjzw19y0rvs87wm6kscp3by")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-bstr" ,rust-bstr-1) ("rust-document-features" ,rust-document-features-0.2) ("rust-gix-chunk" ,rust-gix-chunk-0.4) - ("rust-gix-features" ,rust-gix-features-0.36) - ("rust-gix-hash" ,rust-gix-hash-0.13) + ("rust-gix-features" ,rust-gix-features-0.37) + ("rust-gix-hash" ,rust-gix-hash-0.14) ("rust-memmap2" ,rust-memmap2-0.9) ("rust-serde" ,rust-serde-1) ("rust-thiserror" ,rust-thiserror-1)))) @@ -961,6 +1312,28 @@ command execution.") package provides read only access to git commitgraph file.") (license (list license:expat license:asl2.0)))) +(define-public rust-gix-commitgraph-0.22 + (package + (inherit rust-gix-commitgraph-0.23) + (name "rust-gix-commitgraph") + (version "0.22.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "gix-commitgraph" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0dpcdj9s5pkdvqpc22jm42y2lhkji2jgixps7a05kw11l1xh19w5")))) + (arguments + `(#:cargo-inputs (("rust-bstr" ,rust-bstr-1) + ("rust-document-features" ,rust-document-features-0.2) + ("rust-gix-chunk" ,rust-gix-chunk-0.4) + ("rust-gix-features" ,rust-gix-features-0.36) + ("rust-gix-hash" ,rust-gix-hash-0.13) + ("rust-memmap2" ,rust-memmap2-0.9) + ("rust-serde" ,rust-serde-1) + ("rust-thiserror" ,rust-thiserror-1)))))) + (define-public rust-gix-commitgraph-0.21 (package (inherit rust-gix-commitgraph-0.22) @@ -1006,26 +1379,26 @@ package provides read only access to git commitgraph file.") ("rust-serde" ,rust-serde-1) ("rust-thiserror" ,rust-thiserror-1)))))) -(define-public rust-gix-config-0.31 +(define-public rust-gix-config-0.33 (package (name "rust-gix-config") - (version "0.31.0") + (version "0.33.1") (source (origin (method url-fetch) (uri (crate-uri "gix-config" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1fzraij8rb98j71id939qc56nzaqfaqp8ln3kcvhjv66nk39ibjw")))) + (base32 "0y8h4j2rzdvh20a0clchsy6kga8dlaivapzfqk5av71nbf2h8wrn")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-bstr" ,rust-bstr-1) ("rust-document-features" ,rust-document-features-0.2) ("rust-gix-config-value" ,rust-gix-config-value-0.14) - ("rust-gix-features" ,rust-gix-features-0.36) - ("rust-gix-glob" ,rust-gix-glob-0.14) + ("rust-gix-features" ,rust-gix-features-0.37) + ("rust-gix-glob" ,rust-gix-glob-0.15) ("rust-gix-path" ,rust-gix-path-0.10) - ("rust-gix-ref" ,rust-gix-ref-0.38) + ("rust-gix-ref" ,rust-gix-ref-0.40) ("rust-gix-sec" ,rust-gix-sec-0.10) ("rust-memchr" ,rust-memchr-2) ("rust-once-cell" ,rust-once-cell-1) @@ -1038,10 +1411,70 @@ package provides read only access to git commitgraph file.") (home-page "https://github.com/Byron/gitoxide") (synopsis "Git-config file parser and editor from the Gitoxide project") (description - "A git-config file parser and editor from the Gitoxide project. Gitoxide -is a pure Rust implementation of Git.") + "This package provides a git-config file parser and editor from the +Gitoxide project. Gitoxide is a pure Rust implementation of Git.") (license (list license:expat license:asl2.0)))) +(define-public rust-gix-config-0.32 + (package + (inherit rust-gix-config-0.33) + (name "rust-gix-config") + (version "0.32.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "gix-config" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1hz0rj2nx16jrmp6sjzamk2wk96zcmq1s4lfp2c6wryqalflfh83")))) + (arguments + `(#:cargo-inputs (("rust-bstr" ,rust-bstr-1) + ("rust-document-features" ,rust-document-features-0.2) + ("rust-gix-config-value" ,rust-gix-config-value-0.14) + ("rust-gix-features" ,rust-gix-features-0.36) + ("rust-gix-glob" ,rust-gix-glob-0.14) + ("rust-gix-path" ,rust-gix-path-0.10) + ("rust-gix-ref" ,rust-gix-ref-0.39) + ("rust-gix-sec" ,rust-gix-sec-0.10) + ("rust-memchr" ,rust-memchr-2) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-serde" ,rust-serde-1) + ("rust-smallvec" ,rust-smallvec-1) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-unicode-bom" ,rust-unicode-bom-2) + ("rust-winnow" ,rust-winnow-0.5)) + #:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.5)))))) + +(define-public rust-gix-config-0.31 + (package + (inherit rust-gix-config-0.32) + (name "rust-gix-config") + (version "0.31.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "gix-config" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1fzraij8rb98j71id939qc56nzaqfaqp8ln3kcvhjv66nk39ibjw")))) + (arguments + `(#:cargo-inputs (("rust-bstr" ,rust-bstr-1) + ("rust-document-features" ,rust-document-features-0.2) + ("rust-gix-config-value" ,rust-gix-config-value-0.14) + ("rust-gix-features" ,rust-gix-features-0.36) + ("rust-gix-glob" ,rust-gix-glob-0.14) + ("rust-gix-path" ,rust-gix-path-0.10) + ("rust-gix-ref" ,rust-gix-ref-0.38) + ("rust-gix-sec" ,rust-gix-sec-0.10) + ("rust-memchr" ,rust-memchr-2) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-serde" ,rust-serde-1) + ("rust-smallvec" ,rust-smallvec-1) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-unicode-bom" ,rust-unicode-bom-2) + ("rust-winnow" ,rust-winnow-0.5)) + #:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.5)))))) + (define-public rust-gix-config-0.30 (package (inherit rust-gix-config-0.31) @@ -1110,14 +1543,14 @@ is a pure Rust implementation of Git.") (define-public rust-gix-config-value-0.14 (package (name "rust-gix-config-value") - (version "0.14.4") + (version "0.14.6") (source (origin (method url-fetch) (uri (crate-uri "gix-config-value" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0n1rbwp35jwjwhx61r6vdgan22ladmxb73a6p386x91pzdxix2jv")))) + (base32 "0158q089kc151h3n0wk43fg4s28v0cjscll2r1w3mcx9n41n5l7v")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-2) @@ -1156,8 +1589,65 @@ Gitoxide a Rust implementation of Git.") ("rust-serde" ,rust-serde-1) ("rust-thiserror" ,rust-thiserror-1)))))) +(define-public rust-gix-credentials-0.23 + (package + (name "rust-gix-credentials") + (version "0.23.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "gix-credentials" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "07wpl3ahldcaa44iscr8ashbym0x51rw8gj0wqx78qqpqfkz631q")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-bstr" ,rust-bstr-1) + ("rust-document-features" ,rust-document-features-0.2) + ("rust-gix-command" ,rust-gix-command-0.3) + ("rust-gix-config-value" ,rust-gix-config-value-0.14) + ("rust-gix-path" ,rust-gix-path-0.10) + ("rust-gix-prompt" ,rust-gix-prompt-0.8) + ("rust-gix-sec" ,rust-gix-sec-0.10) + ("rust-gix-trace" ,rust-gix-trace-0.1) + ("rust-gix-url" ,rust-gix-url-0.26) + ("rust-serde" ,rust-serde-1) + ("rust-thiserror" ,rust-thiserror-1)))) + (home-page "https://github.com/Byron/gitoxide") + (synopsis "Git credentials handlers for Gitoxide") + (description + "Gitoxide is a Rust implementation of Git. This package provides helpers +to interact with Git credentials helpers.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-gix-credentials-0.22 + (package + (inherit rust-gix-credentials-0.23) + (name "rust-gix-credentials") + (version "0.22.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "gix-credentials" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0gcgr1wvgji9l4wk8pifabb77r48b8x5llx0s1mr89qb8m1aqgai")))) + (arguments + `(#:cargo-inputs (("rust-bstr" ,rust-bstr-1) + ("rust-document-features" ,rust-document-features-0.2) + ("rust-gix-command" ,rust-gix-command-0.3) + ("rust-gix-config-value" ,rust-gix-config-value-0.14) + ("rust-gix-path" ,rust-gix-path-0.10) + ("rust-gix-prompt" ,rust-gix-prompt-0.8) + ("rust-gix-sec" ,rust-gix-sec-0.10) + ("rust-gix-trace" ,rust-gix-trace-0.1) + ("rust-gix-url" ,rust-gix-url-0.25) + ("rust-serde" ,rust-serde-1) + ("rust-thiserror" ,rust-thiserror-1)))))) + (define-public rust-gix-credentials-0.21 (package + (inherit rust-gix-credentials-0.22) (name "rust-gix-credentials") (version "0.21.0") (source @@ -1167,7 +1657,6 @@ Gitoxide a Rust implementation of Git.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "1956pmz4sj25kydwh4ardzv9zbdpqrx050g5c4c2m14v0rs5sp0w")))) - (build-system cargo-build-system) (arguments `(#:tests? #f ; use of undeclared crate or module `gix_testtools` #:cargo-inputs (("rust-bstr" ,rust-bstr-1) @@ -1179,13 +1668,7 @@ Gitoxide a Rust implementation of Git.") ("rust-gix-sec" ,rust-gix-sec-0.10) ("rust-gix-url" ,rust-gix-url-0.25) ("rust-serde" ,rust-serde-1) - ("rust-thiserror" ,rust-thiserror-1)))) - (home-page "https://github.com/Byron/gitoxide") - (synopsis "Git credentials handlers for Gitoxide") - (description - "Gitoxide is a Rust implementation of Git. This package provides helpers -to interact with Git credentials.") - (license (list license:expat license:asl2.0)))) + ("rust-thiserror" ,rust-thiserror-1)))))) (define-public rust-gix-credentials-0.20 (package @@ -1241,14 +1724,14 @@ to interact with Git credentials.") (define-public rust-gix-date-0.8 (package (name "rust-gix-date") - (version "0.8.3") + (version "0.8.5") (source (origin (method url-fetch) (uri (crate-uri "gix-date" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0zh6yjxvzxbw92gz3f6846cbxk66wdjbwhp6nm4k9gmyfbxkszzv")))) + (base32 "1755v9rxk388x8ypinlmw5qcl2q9qxll3kinppghx1s1985162qq")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-bstr" ,rust-bstr-1) @@ -1287,8 +1770,72 @@ to interact with Git credentials.") #:cargo-development-inputs (("rust-once-cell" ,rust-once-cell-1)))))) +(define-public rust-gix-diff-0.39 + (package + (name "rust-gix-diff") + (version "0.39.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "gix-diff" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0fmrkrs2d3sfkrr0k0mvglmhhz3igh2q9w772xpnhbf4z1a08spx")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-bstr" ,rust-bstr-1) + ("rust-document-features" ,rust-document-features-0.2) + ("rust-getrandom" ,rust-getrandom-0.2) + ("rust-gix-command" ,rust-gix-command-0.3) + ("rust-gix-filter" ,rust-gix-filter-0.8) + ("rust-gix-fs" ,rust-gix-fs-0.9) + ("rust-gix-hash" ,rust-gix-hash-0.14) + ("rust-gix-object" ,rust-gix-object-0.40) + ("rust-gix-path" ,rust-gix-path-0.10) + ("rust-gix-tempfile" ,rust-gix-tempfile-12) + ("rust-gix-trace" ,rust-gix-trace-0.1) + ("rust-gix-worktree" ,rust-gix-worktree-0.29) + ("rust-imara-diff" ,rust-imara-diff-0.1) + ("rust-serde" ,rust-serde-1) + ("rust-thiserror" ,rust-thiserror-1)))) + (home-page "https://github.com/Byron/gitoxide") + (synopsis "Calculate differences between various Git objects") + (description "Calculate differences between various Git objects. This +package is a part of Gitoxide, a pure Rust implementation of Git.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-gix-diff-0.38 + (package + (inherit rust-gix-diff-0.39) + (name "rust-gix-diff") + (version "0.38.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "gix-diff" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0pf88521djzb0gygr0idi1rqlxdwcjym2bprpps6izkwi22sj6c1")))) + (arguments + `(#:cargo-inputs (("rust-bstr" ,rust-bstr-1) + ("rust-document-features" ,rust-document-features-0.2) + ("rust-getrandom" ,rust-getrandom-0.2) + ("rust-gix-command" ,rust-gix-command-0.3) + ("rust-gix-filter" ,rust-gix-filter-0.7) + ("rust-gix-fs" ,rust-gix-fs-0.8) + ("rust-gix-hash" ,rust-gix-hash-0.13) + ("rust-gix-object" ,rust-gix-object-0.39) + ("rust-gix-path" ,rust-gix-path-0.10) + ("rust-gix-tempfile" ,rust-gix-tempfile-11) + ("rust-gix-trace" ,rust-gix-trace-0.1) + ("rust-gix-worktree" ,rust-gix-worktree-0.28) + ("rust-imara-diff" ,rust-imara-diff-0.1) + ("rust-serde" ,rust-serde-1) + ("rust-thiserror" ,rust-thiserror-1)))))) + (define-public rust-gix-diff-0.37 (package + (inherit rust-gix-diff-0.38) (name "rust-gix-diff") (version "0.37.0") (source @@ -1298,7 +1845,6 @@ to interact with Git credentials.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "0m055q3sywj4i3c3xhdw75ir77l6pn3k9bhazimfvjdqkzv984wk")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-document-features" ,rust-document-features-0.2) ("rust-getrandom" ,rust-getrandom-0.2) @@ -1306,12 +1852,7 @@ to interact with Git credentials.") ("rust-gix-object" ,rust-gix-object-0.38) ("rust-imara-diff" ,rust-imara-diff-0.1) ("rust-serde" ,rust-serde-1) - ("rust-thiserror" ,rust-thiserror-1)))) - (home-page "https://github.com/Byron/gitoxide") - (synopsis "Calculate differences between various Git objects") - (description "Calculate differences between various Git objects. Part of -Gitoxide, a pure Rust implementation of Git.") - (license (list license:expat license:asl2.0)))) + ("rust-thiserror" ,rust-thiserror-1)))))) (define-public rust-gix-diff-0.36 (package @@ -1355,24 +1896,24 @@ Gitoxide, a pure Rust implementation of Git.") ("rust-serde" ,rust-serde-1) ("rust-thiserror" ,rust-thiserror-1)))))) -(define-public rust-gix-discover-0.26 +(define-public rust-gix-discover-0.28 (package (name "rust-gix-discover") - (version "0.26.0") + (version "0.28.1") (source (origin (method url-fetch) (uri (crate-uri "gix-discover" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1wlhqkrfyln97arr3hyllw4xc9gnk2qb4nkh70z8hy0i6bq5qpd4")))) + (base32 "1mj29906cd3qn9q6am0fc2k2g63jvz3cqim652fqjgfwds4v5mxq")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-bstr" ,rust-bstr-1) ("rust-dunce" ,rust-dunce-1) - ("rust-gix-hash" ,rust-gix-hash-0.13) + ("rust-gix-hash" ,rust-gix-hash-0.14) ("rust-gix-path" ,rust-gix-path-0.10) - ("rust-gix-ref" ,rust-gix-ref-0.38) + ("rust-gix-ref" ,rust-gix-ref-0.40) ("rust-gix-sec" ,rust-gix-sec-0.10) ("rust-thiserror" ,rust-thiserror-1)) #:cargo-development-inputs (("rust-defer" ,rust-defer-0.1) @@ -1387,6 +1928,56 @@ Gitoxide, a pure Rust implementation of Git.") This package is part of Gitoxide, a pure Rust implementation of Git.") (license (list license:expat license:asl2.0)))) +(define-public rust-gix-discover-0.27 + (package + (inherit rust-gix-discover-0.28) + (name "rust-gix-discover") + (version "0.27.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "gix-discover" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "01wwjb9g91nzjfnlhgblsdn7nh8259714r44yxykn2xydr0qkbbg")))) + (arguments + `(#:cargo-inputs (("rust-bstr" ,rust-bstr-1) + ("rust-dunce" ,rust-dunce-1) + ("rust-gix-hash" ,rust-gix-hash-0.13) + ("rust-gix-path" ,rust-gix-path-0.10) + ("rust-gix-ref" ,rust-gix-ref-0.39) + ("rust-gix-sec" ,rust-gix-sec-0.10) + ("rust-thiserror" ,rust-thiserror-1)) + #:cargo-development-inputs (("rust-defer" ,rust-defer-0.1) + ("rust-is-ci" ,rust-is-ci-1) + ("rust-serial-test" ,rust-serial-test-2) + ("rust-tempfile" ,rust-tempfile-3)))))) + +(define-public rust-gix-discover-0.26 + (package + (inherit rust-gix-discover-0.27) + (name "rust-gix-discover") + (version "0.26.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "gix-discover" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1wlhqkrfyln97arr3hyllw4xc9gnk2qb4nkh70z8hy0i6bq5qpd4")))) + (arguments + `(#:cargo-inputs (("rust-bstr" ,rust-bstr-1) + ("rust-dunce" ,rust-dunce-1) + ("rust-gix-hash" ,rust-gix-hash-0.13) + ("rust-gix-path" ,rust-gix-path-0.10) + ("rust-gix-ref" ,rust-gix-ref-0.38) + ("rust-gix-sec" ,rust-gix-sec-0.10) + ("rust-thiserror" ,rust-thiserror-1)) + #:cargo-development-inputs (("rust-defer" ,rust-defer-0.1) + ("rust-is-ci" ,rust-is-ci-1) + ("rust-serial-test" ,rust-serial-test-2) + ("rust-tempfile" ,rust-tempfile-3)))))) + (define-public rust-gix-discover-0.25 (package (inherit rust-gix-discover-0.26) @@ -1441,17 +2032,17 @@ This package is part of Gitoxide, a pure Rust implementation of Git.") ("rust-serial-test" ,rust-serial-test-2) ("rust-tempfile" ,rust-tempfile-3)))))) -(define-public rust-gix-features-0.36 +(define-public rust-gix-features-0.38 (package (name "rust-gix-features") - (version "0.36.1") + (version "0.38.1") (source (origin (method url-fetch) (uri (crate-uri "gix-features" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1ckilzixrfylgnw5by3wpmym3ri0v9dbc60dkknfnnxvqsjs8ijd")))) + (base32 "0drbqqn7bxf4zqbnc34zf5ls6ih1flrr79vs6sh4g8i0gl1m8hnv")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-bytes" ,rust-bytes-1) @@ -1460,13 +2051,14 @@ This package is part of Gitoxide, a pure Rust implementation of Git.") ("rust-crossbeam-channel" ,rust-crossbeam-channel-0.5) ("rust-document-features" ,rust-document-features-0.2) ("rust-flate2" ,rust-flate2-1) - ("rust-gix-hash" ,rust-gix-hash-0.13) + ("rust-gix-hash" ,rust-gix-hash-0.14) ("rust-gix-trace" ,rust-gix-trace-0.1) + ("rust-gix-utils" ,rust-gix-utils-0.1) ("rust-jwalk" ,rust-jwalk-0.8) ("rust-libc" ,rust-libc-0.2) ("rust-once-cell" ,rust-once-cell-1) ("rust-parking-lot" ,rust-parking-lot-0.12) - ("rust-prodash" ,rust-prodash-26) + ("rust-prodash" ,rust-prodash-28) ("rust-sha1" ,rust-sha1-0.10) ("rust-sha1-smol" ,rust-sha1-smol-1) ("rust-thiserror" ,rust-thiserror-1) @@ -1480,6 +2072,70 @@ This package is part of Gitoxide, a pure Rust implementation of Git.") compile-time feature flags.") (license (list license:expat license:asl2.0)))) +(define-public rust-gix-features-0.37 + (package + (inherit rust-gix-features-0.38) + (name "rust-gix-features") + (version "0.37.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "gix-features" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1bsp9lb4cy00irinxis6wvqvsdcm9fc1fnvkl05z6rf6vkl700nm")))) + (arguments + `(#:cargo-inputs (("rust-bytes" ,rust-bytes-1) + ("rust-bytesize" ,rust-bytesize-1) + ("rust-crc32fast" ,rust-crc32fast-1) + ("rust-crossbeam-channel" ,rust-crossbeam-channel-0.5) + ("rust-document-features" ,rust-document-features-0.2) + ("rust-flate2" ,rust-flate2-1) + ("rust-gix-hash" ,rust-gix-hash-0.14) + ("rust-gix-trace" ,rust-gix-trace-0.1) + ("rust-jwalk" ,rust-jwalk-0.8) + ("rust-libc" ,rust-libc-0.2) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-parking-lot" ,rust-parking-lot-0.12) + ("rust-prodash" ,rust-prodash-28) + ("rust-sha1" ,rust-sha1-0.10) + ("rust-sha1-smol" ,rust-sha1-smol-1) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-walkdir" ,rust-walkdir-2)) + #:cargo-development-inputs (("rust-bstr" ,rust-bstr-1)))))) + +(define-public rust-gix-features-0.36 + (package + (inherit rust-gix-features-0.38) + (name "rust-gix-features") + (version "0.36.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "gix-features" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1ckilzixrfylgnw5by3wpmym3ri0v9dbc60dkknfnnxvqsjs8ijd")))) + (arguments + `(#:cargo-inputs (("rust-bytes" ,rust-bytes-1) + ("rust-bytesize" ,rust-bytesize-1) + ("rust-crc32fast" ,rust-crc32fast-1) + ("rust-crossbeam-channel" ,rust-crossbeam-channel-0.5) + ("rust-document-features" ,rust-document-features-0.2) + ("rust-flate2" ,rust-flate2-1) + ("rust-gix-hash" ,rust-gix-hash-0.13) + ("rust-gix-trace" ,rust-gix-trace-0.1) + ("rust-jwalk" ,rust-jwalk-0.8) + ("rust-libc" ,rust-libc-0.2) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-parking-lot" ,rust-parking-lot-0.12) + ("rust-prodash" ,rust-prodash-26) + ("rust-sha1" ,rust-sha1-0.10) + ("rust-sha1-smol" ,rust-sha1-smol-1) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-walkdir" ,rust-walkdir-2)) + #:cargo-development-inputs (("rust-bstr" ,rust-bstr-1)))))) + (define-public rust-gix-features-0.35 (package (inherit rust-gix-features-0.36) @@ -1545,8 +2201,71 @@ compile-time feature flags.") #:cargo-development-inputs (("rust-bstr" ,rust-bstr-1)))))) +(define-public rust-gix-filter-0.8 + (package + (name "rust-gix-filter") + (version "0.8.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "gix-filter" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "05p5yr0syd91k0yfn6pdqw66yvbq7q6ffzpd53s5g7dzi3bc367m")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-bstr" ,rust-bstr-1) + ("rust-encoding-rs" ,rust-encoding-rs-0.8) + ("rust-gix-attributes" ,rust-gix-attributes-0.21) + ("rust-gix-command" ,rust-gix-command-0.3) + ("rust-gix-hash" ,rust-gix-hash-0.14) + ("rust-gix-object" ,rust-gix-object-0.40) + ("rust-gix-packetline-blocking" ,rust-gix-packetline-blocking-0.17) + ("rust-gix-path" ,rust-gix-path-0.10) + ("rust-gix-quote" ,rust-gix-quote-0.4) + ("rust-gix-trace" ,rust-gix-trace-0.1) + ("rust-gix-utils" ,rust-gix-utils-0.1) + ("rust-smallvec" ,rust-smallvec-1) + ("rust-thiserror" ,rust-thiserror-1)) + #:cargo-development-inputs (("rust-serial-test" ,rust-serial-test-2)))) + (home-page "https://github.com/Byron/gitoxide") + (synopsis "Part of Gitoxide, this package implements Git filters in Rust") + (description + "This package provides a crate from the Gitoxide project implementing +Git filters in Rust.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-gix-filter-0.7 + (package + (inherit rust-gix-filter-0.8) + (name "rust-gix-filter") + (version "0.7.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "gix-filter" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1w1bgvzr9yjrh00ba2325lwy32x2r4crr496qbkn9hsmisfmqskd")))) + (arguments + `(#:cargo-inputs (("rust-bstr" ,rust-bstr-1) + ("rust-encoding-rs" ,rust-encoding-rs-0.8) + ("rust-gix-attributes" ,rust-gix-attributes-0.20) + ("rust-gix-command" ,rust-gix-command-0.3) + ("rust-gix-hash" ,rust-gix-hash-0.13) + ("rust-gix-object" ,rust-gix-object-0.39) + ("rust-gix-packetline-blocking" ,rust-gix-packetline-blocking-0.17) + ("rust-gix-path" ,rust-gix-path-0.10) + ("rust-gix-quote" ,rust-gix-quote-0.4) + ("rust-gix-trace" ,rust-gix-trace-0.1) + ("rust-gix-utils" ,rust-gix-utils-0.1) + ("rust-smallvec" ,rust-smallvec-1) + ("rust-thiserror" ,rust-thiserror-1)) + #:cargo-development-inputs (("rust-once-cell" ,rust-once-cell-1)))))) + (define-public rust-gix-filter-0.6 (package + (inherit rust-gix-filter-0.7) (name "rust-gix-filter") (version "0.6.0") (source @@ -1556,7 +2275,6 @@ compile-time feature flags.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "1zs288v2l7n8qcbvsjrc3xkm11mynyjwj7jj0ixricdnzp9p9xlj")))) - (build-system cargo-build-system) (arguments `(#:tests? #f ; use of undeclared crate gix_testtools #:cargo-inputs (("rust-bstr" ,rust-bstr-1) @@ -1571,13 +2289,7 @@ compile-time feature flags.") ("rust-gix-trace" ,rust-gix-trace-0.1) ("rust-smallvec" ,rust-smallvec-1) ("rust-thiserror" ,rust-thiserror-1)) - #:cargo-development-inputs (("rust-once-cell" ,rust-once-cell-1)))) - (home-page "https://github.com/Byron/gitoxide") - (synopsis "Part of Gitoxide, this package implements Git filters in Rust") - (description - "This package provides a crate from the Gitoxide project implementing -Git filters in Rust.") - (license (list license:expat license:asl2.0)))) + #:cargo-development-inputs (("rust-once-cell" ,rust-once-cell-1)))))) (define-public rust-gix-filter-0.5 (package @@ -1607,20 +2319,20 @@ Git filters in Rust.") ("rust-thiserror" ,rust-thiserror-1)) #:cargo-development-inputs (("rust-once-cell" ,rust-once-cell-1)))))) -(define-public rust-gix-fs-0.8 +(define-public rust-gix-fs-0.9 (package (name "rust-gix-fs") - (version "0.8.1") + (version "0.9.1") (source (origin (method url-fetch) (uri (crate-uri "gix-fs" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "01z1whm3qn0pinw4inbpvf53kbfw3kjq48h9vrd6lxzm82q6xs10")))) + (base32 "1pgcmp17qizq2zk0s7cn08kd9jhq9rlkk2fbpx5l6dsm00xc4mbm")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs (("rust-gix-features" ,rust-gix-features-0.36) + `(#:cargo-inputs (("rust-gix-features" ,rust-gix-features-0.37) ("rust-serde" ,rust-serde-1)) #:cargo-development-inputs (("rust-tempfile" ,rust-tempfile-3)))) (home-page "https://github.com/Byron/gitoxide") @@ -1630,6 +2342,23 @@ Git filters in Rust.") file system utilities for Gitoxide.") (license (list license:expat license:asl2.0)))) +(define-public rust-gix-fs-0.8 + (package + (inherit rust-gix-fs-0.9) + (name "rust-gix-fs") + (version "0.8.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "gix-fs" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "01z1whm3qn0pinw4inbpvf53kbfw3kjq48h9vrd6lxzm82q6xs10")))) + (arguments + `(#:cargo-inputs (("rust-gix-features" ,rust-gix-features-0.36) + ("rust-serde" ,rust-serde-1)) + #:cargo-development-inputs (("rust-tempfile" ,rust-tempfile-3)))))) + (define-public rust-gix-fs-0.7 (package (inherit rust-gix-fs-0.8) @@ -1662,23 +2391,23 @@ file system utilities for Gitoxide.") `(#:cargo-inputs (("rust-gix-features" ,rust-gix-features-0.30)) #:cargo-development-inputs (("rust-tempfile" ,rust-tempfile-3)))))) -(define-public rust-gix-glob-0.14 +(define-public rust-gix-glob-0.15 (package (name "rust-gix-glob") - (version "0.14.1") + (version "0.15.1") (source (origin (method url-fetch) (uri (crate-uri "gix-glob" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "06gz18spc8p4b3rbbbh2i2dz1ld2cw3ikgxkwmhjkspfqnc95cax")))) + (base32 "1f610aws4ah12phhbj7h4ypbkj8i00f4dpfw8gip09r6igqk4qmf")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-2) ("rust-bstr" ,rust-bstr-1) ("rust-document-features" ,rust-document-features-0.2) - ("rust-gix-features" ,rust-gix-features-0.36) + ("rust-gix-features" ,rust-gix-features-0.37) ("rust-gix-path" ,rust-gix-path-0.10) ("rust-serde" ,rust-serde-1)))) (home-page "https://github.com/Byron/gitoxide") @@ -1688,6 +2417,26 @@ file system utilities for Gitoxide.") matching.") (license (list license:expat license:asl2.0)))) +(define-public rust-gix-glob-0.14 + (package + (inherit rust-gix-glob-0.15) + (name "rust-gix-glob") + (version "0.14.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "gix-glob" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "06gz18spc8p4b3rbbbh2i2dz1ld2cw3ikgxkwmhjkspfqnc95cax")))) + (arguments + `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-2) + ("rust-bstr" ,rust-bstr-1) + ("rust-document-features" ,rust-document-features-0.2) + ("rust-gix-features" ,rust-gix-features-0.36) + ("rust-gix-path" ,rust-gix-path-0.10) + ("rust-serde" ,rust-serde-1)))))) + (define-public rust-gix-glob-0.13 (package (inherit rust-gix-glob-0.14) @@ -1731,17 +2480,17 @@ matching.") ("rust-gix-path" ,rust-gix-path-0.8) ("rust-serde" ,rust-serde-1)))))) -(define-public rust-gix-hash-0.13 +(define-public rust-gix-hash-0.14 (package (name "rust-gix-hash") - (version "0.13.3") + (version "0.14.2") (source (origin (method url-fetch) (uri (crate-uri "gix-hash" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1q1xcp8f5prpyr4x62jixrlgm99snscnf87bny1faqvg4v1gi30z")))) + (base32 "0pjdlxbqxd9lbkccryfw2ghifiq3gz9h8ylliw0va8b16vvpsggr")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-document-features" ,rust-document-features-0.2) @@ -1756,6 +2505,24 @@ matching.") package is part of Gitoxide, a pure Rust implementation of Git.") (license (list license:expat license:asl2.0)))) +(define-public rust-gix-hash-0.13 + (package + (inherit rust-gix-hash-0.14) + (name "rust-gix-hash") + (version "0.13.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "gix-hash" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1q1xcp8f5prpyr4x62jixrlgm99snscnf87bny1faqvg4v1gi30z")))) + (arguments + `(#:cargo-inputs (("rust-document-features" ,rust-document-features-0.2) + ("rust-faster-hex" ,rust-faster-hex-0.9) + ("rust-serde" ,rust-serde-1) + ("rust-thiserror" ,rust-thiserror-1)))))) + (define-public rust-gix-hash-0.11 (package (inherit rust-gix-hash-0.13) @@ -1775,20 +2542,20 @@ package is part of Gitoxide, a pure Rust implementation of Git.") ("rust-serde" ,rust-serde-1) ("rust-thiserror" ,rust-thiserror-1)))))) -(define-public rust-gix-hashtable-0.4 +(define-public rust-gix-hashtable-0.5 (package (name "rust-gix-hashtable") - (version "0.4.1") + (version "0.5.2") (source (origin (method url-fetch) (uri (crate-uri "gix-hashtable" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1jnk93sz53b28ajkn4yrvmh0hj3x2jcb81h6nbqc8zkdh601idpy")))) + (base32 "0hp2m2rvbv0vav5lkq7d7bvx74qrb6w3hnj1rq3aq69wdzhq1pvx")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs (("rust-gix-hash" ,rust-gix-hash-0.13) + `(#:cargo-inputs (("rust-gix-hash" ,rust-gix-hash-0.14) ("rust-hashbrown" ,rust-hashbrown-0.14) ("rust-parking-lot" ,rust-parking-lot-0.12)))) (home-page "https://github.com/Byron/gitoxide") @@ -1799,6 +2566,23 @@ package is part of Gitoxide, a pure Rust implementation of Git.") keys. Part of Gitoxide a Rust implementation of Git.") (license (list license:expat license:asl2.0)))) +(define-public rust-gix-hashtable-0.4 + (package + (inherit rust-gix-hashtable-0.5) + (name "rust-gix-hashtable") + (version "0.4.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "gix-hashtable" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1jnk93sz53b28ajkn4yrvmh0hj3x2jcb81h6nbqc8zkdh601idpy")))) + (arguments + `(#:cargo-inputs (("rust-gix-hash" ,rust-gix-hash-0.13) + ("rust-hashbrown" ,rust-hashbrown-0.14) + ("rust-parking-lot" ,rust-parking-lot-0.12)))))) + (define-public rust-gix-hashtable-0.2 (package (inherit rust-gix-hashtable-0.4) @@ -1816,22 +2600,22 @@ keys. Part of Gitoxide a Rust implementation of Git.") ("rust-hashbrown" ,rust-hashbrown-0.14) ("rust-parking-lot" ,rust-parking-lot-0.12)))))) -(define-public rust-gix-ignore-0.9 +(define-public rust-gix-ignore-0.10 (package (name "rust-gix-ignore") - (version "0.9.1") + (version "0.10.1") (source (origin (method url-fetch) (uri (crate-uri "gix-ignore" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0ydq53isj75vf7gjggnv8yf2jimx7sfk5xpw66hvqi8nya6cq5d2")))) + (base32 "0hr6zmh9gx1qx0rwzj1m44sn8plw5wspyi7kf9zdpbk01i2cwmpk")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-bstr" ,rust-bstr-1) ("rust-document-features" ,rust-document-features-0.2) - ("rust-gix-glob" ,rust-gix-glob-0.14) + ("rust-gix-glob" ,rust-gix-glob-0.15) ("rust-gix-path" ,rust-gix-path-0.10) ("rust-serde" ,rust-serde-1) ("rust-unicode-bom" ,rust-unicode-bom-2)))) @@ -1841,6 +2625,26 @@ keys. Part of Gitoxide a Rust implementation of Git.") "This crate is part of Gitoxide, it handles @code{.gitignore} files.") (license (list license:expat license:asl2.0)))) +(define-public rust-gix-ignore-0.9 + (package + (inherit rust-gix-ignore-0.10) + (name "rust-gix-ignore") + (version "0.9.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "gix-ignore" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0ydq53isj75vf7gjggnv8yf2jimx7sfk5xpw66hvqi8nya6cq5d2")))) + (arguments + `(#:cargo-inputs (("rust-bstr" ,rust-bstr-1) + ("rust-document-features" ,rust-document-features-0.2) + ("rust-gix-glob" ,rust-gix-glob-0.14) + ("rust-gix-path" ,rust-gix-path-0.10) + ("rust-serde" ,rust-serde-1) + ("rust-unicode-bom" ,rust-unicode-bom-2)))))) + (define-public rust-gix-ignore-0.8 (package (inherit rust-gix-ignore-0.9) @@ -1882,8 +2686,87 @@ keys. Part of Gitoxide a Rust implementation of Git.") ("rust-serde" ,rust-serde-1) ("rust-unicode-bom" ,rust-unicode-bom-2)))))) +(define-public rust-gix-index-0.28 + (package + (name "rust-gix-index") + (version "0.28.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "gix-index" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0y47r8830i6fw7djq6la8rn7badk8dvg50mqgxzi7m68yqyycl4y")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-test-flags + (list "--release" "--" + "--skip=access::tests::entry_by_path_with_conflicting_file") + #:cargo-inputs (("rust-bitflags" ,rust-bitflags-2) + ("rust-bstr" ,rust-bstr-1) + ("rust-btoi" ,rust-btoi-0.4) + ("rust-document-features" ,rust-document-features-0.2) + ("rust-filetime" ,rust-filetime-0.2) + ("rust-gix-bitmap" ,rust-gix-bitmap-0.2) + ("rust-gix-features" ,rust-gix-features-0.37) + ("rust-gix-fs" ,rust-gix-fs-0.9) + ("rust-gix-hash" ,rust-gix-hash-0.14) + ("rust-gix-lock" ,rust-gix-lock-12) + ("rust-gix-object" ,rust-gix-object-0.40) + ("rust-gix-traverse" ,rust-gix-traverse-0.36) + ("rust-itoa" ,rust-itoa-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-memmap2" ,rust-memmap2-0.9) + ("rust-rustix" ,rust-rustix-0.38) + ("rust-serde" ,rust-serde-1) + ("rust-smallvec" ,rust-smallvec-1) + ("rust-thiserror" ,rust-thiserror-1)))) + (home-page "https://github.com/Byron/gitoxide") + (synopsis "Part of Gitoxide, this crate implements the Git index file") + (description + "Part of Gitoxide, a pure Rust implementation of Rust. This package's +crate implements the Git index file.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-gix-index-0.27 + (package + (inherit rust-gix-index-0.28) + (name "rust-gix-index") + (version "0.27.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "gix-index" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "173yd650vwvd7ynmwsc7pbf4zr50x4qij3ab4xmfk4i9rpshiwzk")))) + (arguments + `(#:cargo-test-flags + (list "--release" "--" + "--skip=access::tests::entry_by_path_with_conflicting_file") + #:cargo-inputs (("rust-bitflags" ,rust-bitflags-2) + ("rust-bstr" ,rust-bstr-1) + ("rust-btoi" ,rust-btoi-0.4) + ("rust-document-features" ,rust-document-features-0.2) + ("rust-filetime" ,rust-filetime-0.2) + ("rust-gix-bitmap" ,rust-gix-bitmap-0.2) + ("rust-gix-features" ,rust-gix-features-0.36) + ("rust-gix-fs" ,rust-gix-fs-0.8) + ("rust-gix-hash" ,rust-gix-hash-0.13) + ("rust-gix-lock" ,rust-gix-lock-11) + ("rust-gix-object" ,rust-gix-object-0.39) + ("rust-gix-traverse" ,rust-gix-traverse-0.35) + ("rust-itoa" ,rust-itoa-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-memmap2" ,rust-memmap2-0.9) + ("rust-rustix" ,rust-rustix-0.38) + ("rust-serde" ,rust-serde-1) + ("rust-smallvec" ,rust-smallvec-1) + ("rust-thiserror" ,rust-thiserror-1)))))) + (define-public rust-gix-index-0.26 (package + (inherit rust-gix-index-0.27) (name "rust-gix-index") (version "0.26.0") (source @@ -1893,7 +2776,6 @@ keys. Part of Gitoxide a Rust implementation of Git.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "0l0n7cld8m5fq1cnd3lyygmsirw5kzw7gxl8j082wbqv2b64yfn8")))) - (build-system cargo-build-system) (arguments `(#:cargo-test-flags (list "--release" "--" @@ -1914,13 +2796,7 @@ keys. Part of Gitoxide a Rust implementation of Git.") ("rust-memmap2" ,rust-memmap2-0.7) ("rust-serde" ,rust-serde-1) ("rust-smallvec" ,rust-smallvec-1) - ("rust-thiserror" ,rust-thiserror-1)))) - (home-page "https://github.com/Byron/gitoxide") - (synopsis "Part of Gitoxide, this crate implements the Git index file") - (description - "Part of Gitoxide, a pure Rust implementation of Rust. This package's -crate implements the Git index file.") - (license (list license:expat license:asl2.0)))) + ("rust-thiserror" ,rust-thiserror-1)))))) (define-public rust-gix-index-0.25 (package @@ -1987,20 +2863,20 @@ crate implements the Git index file.") ("rust-smallvec" ,rust-smallvec-1) ("rust-thiserror" ,rust-thiserror-1)))))) -(define-public rust-gix-lock-11 +(define-public rust-gix-lock-12 (package (name "rust-gix-lock") - (version "11.0.1") + (version "12.0.1") (source (origin (method url-fetch) (uri (crate-uri "gix-lock" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0drgl9qhkvlhjl0jc0lh2h7h3by1yg9wx4a8cqss8c4qlbk6ap3y")))) + (base32 "001bh0yx1xnkhnbkfj3p3v649sp5hypm4pgq9jsk1qpijy9l62pl")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs (("rust-gix-tempfile" ,rust-gix-tempfile-11) + `(#:cargo-inputs (("rust-gix-tempfile" ,rust-gix-tempfile-12) ("rust-gix-utils" ,rust-gix-utils-0.1) ("rust-thiserror" ,rust-thiserror-1)) #:cargo-development-inputs (("rust-tempfile" ,rust-tempfile-3)))) @@ -2010,6 +2886,24 @@ crate implements the Git index file.") package provides git style lock files.") (license (list license:expat license:asl2.0)))) +(define-public rust-gix-lock-11 + (package + (inherit rust-gix-lock-12) + (name "rust-gix-lock") + (version "11.0.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "gix-lock" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0drgl9qhkvlhjl0jc0lh2h7h3by1yg9wx4a8cqss8c4qlbk6ap3y")))) + (arguments + `(#:cargo-inputs (("rust-gix-tempfile" ,rust-gix-tempfile-11) + ("rust-gix-utils" ,rust-gix-utils-0.1) + ("rust-thiserror" ,rust-thiserror-1)) + #:cargo-development-inputs (("rust-tempfile" ,rust-tempfile-3)))))) + (define-public rust-gix-lock-10 (package (inherit rust-gix-lock-11) @@ -2051,14 +2945,14 @@ package provides git style lock files.") (define-public rust-gix-macros-0.1 (package (name "rust-gix-macros") - (version "0.1.3") + (version "0.1.4") (source (origin (method url-fetch) (uri (crate-uri "gix-macros" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1fz8dqvavv28b6fksjdff4cj6sld3dvxh6nwdmgmk7q552vplpnp")))) + (base32 "0cj048i0a5xzqbv99514xfvhxwn833yzaclkmc9pfzp62j7l7zqx")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) @@ -2071,22 +2965,22 @@ package provides git style lock files.") implementation of Git.") (license (list license:expat license:asl2.0)))) -(define-public rust-gix-mailmap-0.20 +(define-public rust-gix-mailmap-0.21 (package (name "rust-gix-mailmap") - (version "0.20.1") + (version "0.21.1") (source (origin (method url-fetch) (uri (crate-uri "gix-mailmap" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "01wzzs8gifl6i4vzwbx1ywzwgazy1db6yfh8b3bjsssy1pn5ycp2")))) + (base32 "05sscbs0qzn40syp0v7s2xrjx10pdfqqg53axr8xrggcmv1mm1dv")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-bstr" ,rust-bstr-1) ("rust-document-features" ,rust-document-features-0.2) - ("rust-gix-actor" ,rust-gix-actor-0.28) + ("rust-gix-actor" ,rust-gix-actor-0.29) ("rust-gix-date" ,rust-gix-date-0.8) ("rust-serde" ,rust-serde-1) ("rust-thiserror" ,rust-thiserror-1)))) @@ -2097,6 +2991,26 @@ implementation of Git.") Gitoxide, a pure Rust implementation of Git.") (license (list license:expat license:asl2.0)))) +(define-public rust-gix-mailmap-0.20 + (package + (inherit rust-gix-mailmap-0.21) + (name "rust-gix-mailmap") + (version "0.20.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "gix-mailmap" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "01wzzs8gifl6i4vzwbx1ywzwgazy1db6yfh8b3bjsssy1pn5ycp2")))) + (arguments + `(#:cargo-inputs (("rust-bstr" ,rust-bstr-1) + ("rust-document-features" ,rust-document-features-0.2) + ("rust-gix-actor" ,rust-gix-actor-0.28) + ("rust-gix-date" ,rust-gix-date-0.8) + ("rust-serde" ,rust-serde-1) + ("rust-thiserror" ,rust-thiserror-1)))))) + (define-public rust-gix-mailmap-0.19 (package (inherit rust-gix-mailmap-0.20) @@ -2139,8 +3053,59 @@ Gitoxide, a pure Rust implementation of Git.") ("rust-serde" ,rust-serde-1) ("rust-thiserror" ,rust-thiserror-1)))))) +(define-public rust-gix-negotiate-0.11 + (package + (name "rust-gix-negotiate") + (version "0.11.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "gix-negotiate" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "10nmbml8jz86rq6p2pcc4i7ks0naa9s069i80nnzcng2x6shp0p6")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-2) + ("rust-gix-commitgraph" ,rust-gix-commitgraph-0.23) + ("rust-gix-date" ,rust-gix-date-0.8) + ("rust-gix-hash" ,rust-gix-hash-0.14) + ("rust-gix-object" ,rust-gix-object-0.40) + ("rust-gix-revwalk" ,rust-gix-revwalk-0.11) + ("rust-smallvec" ,rust-smallvec-1) + ("rust-thiserror" ,rust-thiserror-1)))) + (home-page "https://github.com/Byron/gitoxide") + (synopsis "Implements Git's negotiation algorithms as part of Gixoxide") + (description + "Gitoxide is a pure Rust implementation of Git. This package consists of +Git's negotiation algorithms.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-gix-negotiate-0.10 + (package + (inherit rust-gix-negotiate-0.11) + (name "rust-gix-negotiate") + (version "0.10.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "gix-negotiate" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0540dz6pcybn1g3mq47nvpnmj90akkrasl4b07fv6lf0v766m7wp")))) + (arguments + `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-2) + ("rust-gix-commitgraph" ,rust-gix-commitgraph-0.22) + ("rust-gix-date" ,rust-gix-date-0.8) + ("rust-gix-hash" ,rust-gix-hash-0.13) + ("rust-gix-object" ,rust-gix-object-0.39) + ("rust-gix-revwalk" ,rust-gix-revwalk-0.10) + ("rust-smallvec" ,rust-smallvec-1) + ("rust-thiserror" ,rust-thiserror-1)))))) + (define-public rust-gix-negotiate-0.9 (package + (inherit rust-gix-negotiate-0.10) (name "rust-gix-negotiate") (version "0.9.0") (source @@ -2150,7 +3115,6 @@ Gitoxide, a pure Rust implementation of Git.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "0zxnxfjjqxap8plkhz5f4h0gwm83ain229y2vhwwxjgcj7sdqp1a")))) - (build-system cargo-build-system) (arguments `(#:tests? #f ; user of undeclared crate gix_testtools #:cargo-inputs (("rust-bitflags" ,rust-bitflags-2) @@ -2160,13 +3124,7 @@ Gitoxide, a pure Rust implementation of Git.") ("rust-gix-object" ,rust-gix-object-0.38) ("rust-gix-revwalk" ,rust-gix-revwalk-0.9) ("rust-smallvec" ,rust-smallvec-1) - ("rust-thiserror" ,rust-thiserror-1)))) - (home-page "https://github.com/Byron/gitoxide") - (synopsis "Implements Git's negotiation algorithms as part of Gixoxide") - (description - "Gitoxide is a pure Rust implementation of Git. This package consists of -Git's negotiation algorithms.") - (license (list license:expat license:asl2.0)))) + ("rust-thiserror" ,rust-thiserror-1)))))) (define-public rust-gix-negotiate-0.8 (package @@ -2214,26 +3172,26 @@ Git's negotiation algorithms.") ("rust-smallvec" ,rust-smallvec-1) ("rust-thiserror" ,rust-thiserror-1)))))) -(define-public rust-gix-object-0.38 +(define-public rust-gix-object-0.40 (package (name "rust-gix-object") - (version "0.38.0") + (version "0.40.1") (source (origin (method url-fetch) (uri (crate-uri "gix-object" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0lbaz0mzsg5vvm5qvi1nf6f0hyz62hfx18xk3h57fn3z4r22l3vl")))) + (base32 "18hklfk1a1mpnr1syxb40dhy92c5yfl6b1ilvsgv8hdaiwp4128c")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-bstr" ,rust-bstr-1) ("rust-btoi" ,rust-btoi-0.4) ("rust-document-features" ,rust-document-features-0.2) - ("rust-gix-actor" ,rust-gix-actor-0.28) + ("rust-gix-actor" ,rust-gix-actor-0.29) ("rust-gix-date" ,rust-gix-date-0.8) - ("rust-gix-features" ,rust-gix-features-0.36) - ("rust-gix-hash" ,rust-gix-hash-0.13) + ("rust-gix-features" ,rust-gix-features-0.37) + ("rust-gix-hash" ,rust-gix-hash-0.14) ("rust-gix-validate" ,rust-gix-validate-0.8) ("rust-itoa" ,rust-itoa-1) ("rust-serde" ,rust-serde-1) @@ -2252,6 +3210,66 @@ functions to handle immutable and mutable git objects with decoding and encoding support.") (license (list license:expat license:asl2.0)))) +(define-public rust-gix-object-0.39 + (package + (inherit rust-gix-object-0.40) + (name "rust-gix-object") + (version "0.39.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "gix-object" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0cqya07cwq0wcx2kzmxsm9acpl4mwsxwfx797z3c282phb2pkgzy")))) + (arguments + `(#:cargo-inputs (("rust-bstr" ,rust-bstr-1) + ("rust-btoi" ,rust-btoi-0.4) + ("rust-document-features" ,rust-document-features-0.2) + ("rust-gix-actor" ,rust-gix-actor-0.28) + ("rust-gix-date" ,rust-gix-date-0.8) + ("rust-gix-features" ,rust-gix-features-0.36) + ("rust-gix-hash" ,rust-gix-hash-0.13) + ("rust-gix-validate" ,rust-gix-validate-0.8) + ("rust-itoa" ,rust-itoa-1) + ("rust-serde" ,rust-serde-1) + ("rust-smallvec" ,rust-smallvec-1) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-winnow" ,rust-winnow-0.5)) + #:cargo-development-inputs + (("rust-criterion" ,rust-criterion-0.5) + ("rust-pretty-assertions" ,rust-pretty-assertions-1)))))) + +(define-public rust-gix-object-0.38 + (package + (inherit rust-gix-object-0.39) + (name "rust-gix-object") + (version "0.38.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "gix-object" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0lbaz0mzsg5vvm5qvi1nf6f0hyz62hfx18xk3h57fn3z4r22l3vl")))) + (arguments + `(#:cargo-inputs (("rust-bstr" ,rust-bstr-1) + ("rust-btoi" ,rust-btoi-0.4) + ("rust-document-features" ,rust-document-features-0.2) + ("rust-gix-actor" ,rust-gix-actor-0.28) + ("rust-gix-date" ,rust-gix-date-0.8) + ("rust-gix-features" ,rust-gix-features-0.36) + ("rust-gix-hash" ,rust-gix-hash-0.13) + ("rust-gix-validate" ,rust-gix-validate-0.8) + ("rust-itoa" ,rust-itoa-1) + ("rust-serde" ,rust-serde-1) + ("rust-smallvec" ,rust-smallvec-1) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-winnow" ,rust-winnow-0.5)) + #:cargo-development-inputs + (("rust-criterion" ,rust-criterion-0.5) + ("rust-pretty-assertions" ,rust-pretty-assertions-1)))))) + (define-public rust-gix-object-0.37 (package (inherit rust-gix-object-0.38) @@ -2312,26 +3330,26 @@ support.") #:cargo-development-inputs (("rust-pretty-assertions" ,rust-pretty-assertions-1)))))) -(define-public rust-gix-odb-0.54 +(define-public rust-gix-odb-0.56 (package (name "rust-gix-odb") - (version "0.54.0") + (version "0.56.1") (source (origin (method url-fetch) (uri (crate-uri "gix-odb" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0fql2p0xinkdaq7bybz12j1yw0b4lq3d1nl3sf2ad3qdp1nbac46")))) + (base32 "1c9kgiv8frpwz9nz9n6wai8xys8vawnfhw1mnz1cchfyffl6vbj6")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-arc-swap" ,rust-arc-swap-1) ("rust-document-features" ,rust-document-features-0.2) ("rust-gix-date" ,rust-gix-date-0.8) - ("rust-gix-features" ,rust-gix-features-0.36) - ("rust-gix-hash" ,rust-gix-hash-0.13) - ("rust-gix-object" ,rust-gix-object-0.38) - ("rust-gix-pack" ,rust-gix-pack-0.44) + ("rust-gix-features" ,rust-gix-features-0.37) + ("rust-gix-hash" ,rust-gix-hash-0.14) + ("rust-gix-object" ,rust-gix-object-0.40) + ("rust-gix-pack" ,rust-gix-pack-0.46) ("rust-gix-path" ,rust-gix-path-0.10) ("rust-gix-quote" ,rust-gix-quote-0.4) ("rust-parking-lot" ,rust-parking-lot-0.12) @@ -2344,6 +3362,60 @@ support.") Gitoxide is a pure Rust implementation of Git.") (license (list license:expat license:asl2.0)))) +(define-public rust-gix-odb-0.55 + (package + (inherit rust-gix-odb-0.56) + (name "rust-gix-odb") + (version "0.55.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "gix-odb" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1b1vr5yp96a3ik32a41rp749v2nir7n6hhwdrip9rja02nbmzbhz")))) + (arguments + `(#:cargo-inputs (("rust-arc-swap" ,rust-arc-swap-1) + ("rust-document-features" ,rust-document-features-0.2) + ("rust-gix-date" ,rust-gix-date-0.8) + ("rust-gix-features" ,rust-gix-features-0.36) + ("rust-gix-hash" ,rust-gix-hash-0.13) + ("rust-gix-object" ,rust-gix-object-0.39) + ("rust-gix-pack" ,rust-gix-pack-0.45) + ("rust-gix-path" ,rust-gix-path-0.10) + ("rust-gix-quote" ,rust-gix-quote-0.4) + ("rust-parking-lot" ,rust-parking-lot-0.12) + ("rust-serde" ,rust-serde-1) + ("rust-tempfile" ,rust-tempfile-3) + ("rust-thiserror" ,rust-thiserror-1)))))) + +(define-public rust-gix-odb-0.54 + (package + (inherit rust-gix-odb-0.55) + (name "rust-gix-odb") + (version "0.54.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "gix-odb" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0fql2p0xinkdaq7bybz12j1yw0b4lq3d1nl3sf2ad3qdp1nbac46")))) + (arguments + `(#:cargo-inputs (("rust-arc-swap" ,rust-arc-swap-1) + ("rust-document-features" ,rust-document-features-0.2) + ("rust-gix-date" ,rust-gix-date-0.8) + ("rust-gix-features" ,rust-gix-features-0.36) + ("rust-gix-hash" ,rust-gix-hash-0.13) + ("rust-gix-object" ,rust-gix-object-0.38) + ("rust-gix-pack" ,rust-gix-pack-0.44) + ("rust-gix-path" ,rust-gix-path-0.10) + ("rust-gix-quote" ,rust-gix-quote-0.4) + ("rust-parking-lot" ,rust-parking-lot-0.12) + ("rust-serde" ,rust-serde-1) + ("rust-tempfile" ,rust-tempfile-3) + ("rust-thiserror" ,rust-thiserror-1)))))) + (define-public rust-gix-odb-0.53 (package (inherit rust-gix-odb-0.54) @@ -2404,8 +3476,79 @@ Gitoxide is a pure Rust implementation of Git.") ("rust-maplit" ,rust-maplit-1) ("rust-pretty-assertions" ,rust-pretty-assertions-1)))))) +(define-public rust-gix-pack-0.46 + (package + (name "rust-gix-pack") + (version "0.46.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "gix-pack" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "16jsy3b1rnp0xinwlaz71zsnamqzhnlys3a0bhnhf50ag514savq")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; use of undeclared create gix_testtools + #:cargo-inputs (("rust-clru" ,rust-clru-0.6) + ("rust-document-features" ,rust-document-features-0.2) + ("rust-gix-chunk" ,rust-gix-chunk-0.4) + ("rust-gix-diff" ,rust-gix-diff-0.39) + ("rust-gix-features" ,rust-gix-features-0.37) + ("rust-gix-hash" ,rust-gix-hash-0.14) + ("rust-gix-hashtable" ,rust-gix-hashtable-0.5) + ("rust-gix-object" ,rust-gix-object-0.40) + ("rust-gix-path" ,rust-gix-path-0.10) + ("rust-gix-tempfile" ,rust-gix-tempfile-12) + ("rust-gix-traverse" ,rust-gix-traverse-0.36) + ("rust-memmap2" ,rust-memmap2-0.9) + ("rust-parking-lot" ,rust-parking-lot-0.12) + ("rust-serde" ,rust-serde-1) + ("rust-smallvec" ,rust-smallvec-1) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-uluru" ,rust-uluru-3)))) + (home-page "https://github.com/Byron/gitoxide") + (synopsis "Implements Git packs and related data structures") + (description + "Git packs and related data structures for Gitoxide. Gitoxide is a pure +Rust implementation of Git.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-gix-pack-0.45 + (package + (inherit rust-gix-pack-0.46) + (name "rust-gix-pack") + (version "0.45.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "gix-pack" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "019jbbbxq53r5l7sfh3vcbyyzagrmxhg6vs5fgrxsvs4j8f4jsa5")))) + (arguments + `(#:tests? #f ; use of undeclared create gix_testtools + #:cargo-inputs (("rust-clru" ,rust-clru-0.6) + ("rust-document-features" ,rust-document-features-0.2) + ("rust-gix-chunk" ,rust-gix-chunk-0.4) + ("rust-gix-diff" ,rust-gix-diff-0.38) + ("rust-gix-features" ,rust-gix-features-0.36) + ("rust-gix-hash" ,rust-gix-hash-0.13) + ("rust-gix-hashtable" ,rust-gix-hashtable-0.4) + ("rust-gix-object" ,rust-gix-object-0.39) + ("rust-gix-path" ,rust-gix-path-0.10) + ("rust-gix-tempfile" ,rust-gix-tempfile-11) + ("rust-gix-traverse" ,rust-gix-traverse-0.35) + ("rust-memmap2" ,rust-memmap2-0.9) + ("rust-parking-lot" ,rust-parking-lot-0.12) + ("rust-serde" ,rust-serde-1) + ("rust-smallvec" ,rust-smallvec-1) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-uluru" ,rust-uluru-3)))))) + (define-public rust-gix-pack-0.44 (package + (inherit rust-gix-pack-0.45) (name "rust-gix-pack") (version "0.44.0") (source @@ -2415,7 +3558,6 @@ Gitoxide is a pure Rust implementation of Git.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "1hwphs7ks8pf6v4wrmhd4iy8vj1in95db4q6j82i9zyy60pblc8l")))) - (build-system cargo-build-system) (arguments `(#:tests? #f ; use of undeclared create gix_testtools #:cargo-inputs (("rust-clru" ,rust-clru-0.6) @@ -2434,13 +3576,7 @@ Gitoxide is a pure Rust implementation of Git.") ("rust-serde" ,rust-serde-1) ("rust-smallvec" ,rust-smallvec-1) ("rust-thiserror" ,rust-thiserror-1) - ("rust-uluru" ,rust-uluru-3)))) - (home-page "https://github.com/Byron/gitoxide") - (synopsis "Implements Git packs and related data structures") - (description - "Git packs and related data structures for Gitoxide. Gitoxide is a pure -Rust implementation of Git.") - (license (list license:expat license:asl2.0)))) + ("rust-uluru" ,rust-uluru-3)))))) (define-public rust-gix-pack-0.43 (package @@ -2507,8 +3643,41 @@ Rust implementation of Git.") ("rust-thiserror" ,rust-thiserror-1) ("rust-uluru" ,rust-uluru-3)))))) +(define-public rust-gix-packetline-0.17 + (package + (name "rust-gix-packetline") + (version "0.17.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "gix-packetline" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "05d5airkhk7pykgs4p1nwvscv62hb106xyjxnvavc0q9vaz8c15p")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-bstr" ,rust-bstr-1) + ("rust-document-features" ,rust-document-features-0.2) + ("rust-faster-hex" ,rust-faster-hex-0.9) + ("rust-futures-io" ,rust-futures-io-0.3) + ("rust-futures-lite" ,rust-futures-lite-2) + ("rust-gix-trace" ,rust-gix-trace-0.1) + ("rust-pin-project-lite" ,rust-pin-project-lite-0.2) + ("rust-serde" ,rust-serde-1) + ("rust-thiserror" ,rust-thiserror-1)) + #:cargo-development-inputs (("rust-async-std" ,rust-async-std-1) + ("rust-maybe-async" ,rust-maybe-async-0.2)))) + (home-page "https://github.com/Byron/gitoxide") + (synopsis + "Crate of the gitoxide project implementing the pkt-line serialization format") + (description + "This package provides a crate of the gitoxide project implementing the +pkt-line serialization format.") + (license (list license:expat license:asl2.0)))) + (define-public rust-gix-packetline-0.16 (package + (inherit rust-gix-packetline-0.17) (name "rust-gix-packetline") (version "0.16.7") (source @@ -2518,7 +3687,6 @@ Rust implementation of Git.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "1ayp00k4a6qgjjyrd2rmzxyx0n8h36dxscjn1pzil5b4x6qq90wa")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-bstr" ,rust-bstr-1) @@ -2531,17 +3699,38 @@ Rust implementation of Git.") ("rust-thiserror" ,rust-thiserror-1)) #:cargo-development-inputs (("rust-async-std" ,rust-async-std-1) - ("rust-maybe-async" ,rust-maybe-async-0.2)))) + ("rust-maybe-async" ,rust-maybe-async-0.2)))))) + +(define-public rust-gix-packetline-blocking-0.17 + (package + (name "rust-gix-packetline-blocking") + (version "0.17.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "gix-packetline-blocking" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1xx2kd51hbrrhsrixka0sc2chcyh6k090bjppzrjc3m57vfzd3na")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-bstr" ,rust-bstr-1) + ("rust-document-features" ,rust-document-features-0.2) + ("rust-faster-hex" ,rust-faster-hex-0.9) + ("rust-gix-trace" ,rust-gix-trace-0.1) + ("rust-serde" ,rust-serde-1) + ("rust-thiserror" ,rust-thiserror-1)))) (home-page "https://github.com/Byron/gitoxide") (synopsis - "Crate of the gitoxide project implementing the pkt-line serialization format") - (description - "This package provides a crate of the gitoxide project implementing the -pkt-line serialization format.") + "Duplicate of @code{gix-packetline} with @code{blocking-io} selected") + (description "Part of Gitoxide, a pure Rust implementation of Git. This +package is a duplicate of @code{gix-packetline} with the @code{blocking-io} +feature pre-selected.") (license (list license:expat license:asl2.0)))) (define-public rust-gix-packetline-blocking-0.16 (package + (inherit rust-gix-packetline-blocking-0.17) (name "rust-gix-packetline-blocking") (version "0.16.6") (source @@ -2551,32 +3740,24 @@ pkt-line serialization format.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "0f9dr79jz9y11qhf0syxwa4nvn4czpyka84hzshxd10wa3vrb0vx")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-bstr" ,rust-bstr-1) ("rust-document-features" ,rust-document-features-0.2) ("rust-faster-hex" ,rust-faster-hex-0.8) ("rust-serde" ,rust-serde-1) - ("rust-thiserror" ,rust-thiserror-1)))) - (home-page "https://github.com/Byron/gitoxide") - (synopsis - "Duplicate of @code{gix-packetline} with @code{blocking-io} selected") - (description - "Part of Gitoxide, a pure Rust implementation of Git. This package is a -duplicate of @code{gix-packetline} with the @code{blocking-io} feature pre-selected") - (license (list license:expat license:asl2.0)))) + ("rust-thiserror" ,rust-thiserror-1)))))) (define-public rust-gix-path-0.10 (package (name "rust-gix-path") - (version "0.10.4") + (version "0.10.7") (source (origin (method url-fetch) (uri (crate-uri "gix-path" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0h1fkwz2ll7ahyd3sy127w3bkcv4lncl1ml37z6bxldf44k2i9hl")))) + (base32 "10w7abk2wcp0w2y943sdlsic3xc91d6qr29zjinilsbmykq3qqi3")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-bstr" ,rust-bstr-1) @@ -2615,24 +3796,24 @@ Git. This crate deals with paths and their conversions") #:cargo-development-inputs (("rust-tempfile" ,rust-tempfile-3)))))) -(define-public rust-gix-pathspec-0.4 +(define-public rust-gix-pathspec-0.5 (package (name "rust-gix-pathspec") - (version "0.4.1") + (version "0.5.1") (source (origin (method url-fetch) (uri (crate-uri "gix-pathspec" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0ka9h2lfgbfbby5rciipgy6nkl1qkcrhp0xvr11z13m3flpvkfqx")))) + (base32 "0iqj3l4z29sg2z4bb21dn3n58wd1jgl6ydpnradzh13wa7lhxnqc")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-2) ("rust-bstr" ,rust-bstr-1) - ("rust-gix-attributes" ,rust-gix-attributes-0.20) + ("rust-gix-attributes" ,rust-gix-attributes-0.21) ("rust-gix-config-value" ,rust-gix-config-value-0.14) - ("rust-gix-glob" ,rust-gix-glob-0.14) + ("rust-gix-glob" ,rust-gix-glob-0.15) ("rust-gix-path" ,rust-gix-path-0.10) ("rust-thiserror" ,rust-thiserror-1)) #:cargo-development-inputs (("rust-once-cell" ,rust-once-cell-1) @@ -2644,6 +3825,29 @@ Git. This crate deals with paths and their conversions") part of Gitoxide, a Rust implementation of Git.") (license (list license:expat license:asl2.0)))) +(define-public rust-gix-pathspec-0.4 + (package + (inherit rust-gix-pathspec-0.5) + (name "rust-gix-pathspec") + (version "0.4.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "gix-pathspec" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0ka9h2lfgbfbby5rciipgy6nkl1qkcrhp0xvr11z13m3flpvkfqx")))) + (arguments + `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-2) + ("rust-bstr" ,rust-bstr-1) + ("rust-gix-attributes" ,rust-gix-attributes-0.20) + ("rust-gix-config-value" ,rust-gix-config-value-0.14) + ("rust-gix-glob" ,rust-gix-glob-0.14) + ("rust-gix-path" ,rust-gix-path-0.10) + ("rust-thiserror" ,rust-thiserror-1)) + #:cargo-development-inputs (("rust-once-cell" ,rust-once-cell-1) + ("rust-serial-test" ,rust-serial-test-2)))))) + (define-public rust-gix-pathspec-0.3 (package (inherit rust-gix-pathspec-0.4) @@ -2668,20 +3872,20 @@ part of Gitoxide, a Rust implementation of Git.") #:cargo-development-inputs (("rust-once-cell" ,rust-once-cell-1) ("rust-serial-test" ,rust-serial-test-2)))))) -(define-public rust-gix-prompt-0.7 +(define-public rust-gix-prompt-0.8 (package (name "rust-gix-prompt") - (version "0.7.0") + (version "0.8.4") (source (origin (method url-fetch) (uri (crate-uri "gix-prompt" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0y26b3d7z222b223ir9qf8yqwhknzc3c5yksjffmwvsid4vr36jw")))) + (base32 "1n2m39if2wkxdgs3p2w8p5arv822sqaj6p7cbp9fbdg7gjqmwcpm")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs (("rust-gix-command" ,rust-gix-command-0.2) + `(#:cargo-inputs (("rust-gix-command" ,rust-gix-command-0.3) ("rust-gix-config-value" ,rust-gix-config-value-0.14) ("rust-parking-lot" ,rust-parking-lot-0.12) ("rust-rustix" ,rust-rustix-0.38) @@ -2695,6 +3899,27 @@ part of Gitoxide, a Rust implementation of Git.") terminals prompt.") (license (list license:expat license:asl2.0)))) +(define-public rust-gix-prompt-0.7 + (package + (inherit rust-gix-prompt-0.8) + (name "rust-gix-prompt") + (version "0.7.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "gix-prompt" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0y26b3d7z222b223ir9qf8yqwhknzc3c5yksjffmwvsid4vr36jw")))) + (arguments + `(#:cargo-inputs (("rust-gix-command" ,rust-gix-command-0.2) + ("rust-gix-config-value" ,rust-gix-config-value-0.14) + ("rust-parking-lot" ,rust-parking-lot-0.12) + ("rust-rustix" ,rust-rustix-0.38) + ("rust-thiserror" ,rust-thiserror-1)) + #:cargo-development-inputs (("rust-expectrl" ,rust-expectrl-0.7) + ("rust-serial-test" ,rust-serial-test-2)))))) + (define-public rust-gix-prompt-0.5 (package (inherit rust-gix-prompt-0.7) @@ -2718,8 +3943,79 @@ terminals prompt.") (("rust-expectrl" ,rust-expectrl-0.7) ("rust-serial-test" ,rust-serial-test-2)))))) +(define-public rust-gix-protocol-0.43 + (package + (name "rust-gix-protocol") + (version "0.43.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "gix-protocol" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1pfg4b0b6a753mxrp2x7jaclry6d88x3lzxx7dgi14ar8cw2g9gc")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-async-trait" ,rust-async-trait-0.1) + ("rust-bstr" ,rust-bstr-1) + ("rust-btoi" ,rust-btoi-0.4) + ("rust-document-features" ,rust-document-features-0.2) + ("rust-futures-io" ,rust-futures-io-0.3) + ("rust-futures-lite" ,rust-futures-lite-2) + ("rust-gix-credentials" ,rust-gix-credentials-0.23) + ("rust-gix-date" ,rust-gix-date-0.8) + ("rust-gix-features" ,rust-gix-features-0.37) + ("rust-gix-hash" ,rust-gix-hash-0.14) + ("rust-gix-transport" ,rust-gix-transport-0.40) + ("rust-maybe-async" ,rust-maybe-async-0.2) + ("rust-serde" ,rust-serde-1) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-winnow" ,rust-winnow-0.5)) + #:cargo-development-inputs + (("rust-async-std" ,rust-async-std-1) + ("rust-gix-packetline" ,rust-gix-packetline-0.17)))) + (home-page "https://github.com/Byron/gitoxide") + (synopsis "Implementation of Git protocols that's part of Gitoxide") + (description + "This package implements Git protocols for Gitoxide. Gitoxide is a pure +Rust implementation of Git.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-gix-protocol-0.42 + (package + (inherit rust-gix-protocol-0.43) + (name "rust-gix-protocol") + (version "0.42.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "gix-protocol" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "05zq1vpak1nd83155j4n7gqvj8zmzkxr39yybddd22yv0zs6wwwm")))) + (arguments + `(#:cargo-inputs (("rust-async-trait" ,rust-async-trait-0.1) + ("rust-bstr" ,rust-bstr-1) + ("rust-btoi" ,rust-btoi-0.4) + ("rust-document-features" ,rust-document-features-0.2) + ("rust-futures-io" ,rust-futures-io-0.3) + ("rust-futures-lite" ,rust-futures-lite-1) + ("rust-gix-credentials" ,rust-gix-credentials-0.22) + ("rust-gix-date" ,rust-gix-date-0.8) + ("rust-gix-features" ,rust-gix-features-0.36) + ("rust-gix-hash" ,rust-gix-hash-0.13) + ("rust-gix-transport" ,rust-gix-transport-0.39) + ("rust-maybe-async" ,rust-maybe-async-0.2) + ("rust-serde" ,rust-serde-1) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-winnow" ,rust-winnow-0.5)) + #:cargo-development-inputs + (("rust-async-std" ,rust-async-std-1) + ("rust-gix-packetline" ,rust-gix-packetline-0.17)))))) + (define-public rust-gix-protocol-0.41 (package + (inherit rust-gix-protocol-0.42) (name "rust-gix-protocol") (version "0.41.1") (source @@ -2729,7 +4025,6 @@ terminals prompt.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "03hy77hbszssdkc4iwig3f82ib4i6agfag37svd90pzsppm3y7ir")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-async-trait" ,rust-async-trait-0.1) ("rust-bstr" ,rust-bstr-1) @@ -2746,14 +4041,9 @@ terminals prompt.") ("rust-serde" ,rust-serde-1) ("rust-thiserror" ,rust-thiserror-1) ("rust-winnow" ,rust-winnow-0.5)) - #:cargo-development-inputs (("rust-async-std" ,rust-async-std-1) - ("rust-gix-packetline" ,rust-gix-packetline-0.16)))) - (home-page "https://github.com/Byron/gitoxide") - (synopsis "Implementation of Git protocols that's part of Gitoxide") - (description - "This package implements Git protocols for Gitoxide. Gitoxide is a pure -Rust implementation of Git.") - (license (list license:expat license:asl2.0)))) + #:cargo-development-inputs + (("rust-async-std" ,rust-async-std-1) + ("rust-gix-packetline" ,rust-gix-packetline-0.16)))))) (define-public rust-gix-protocol-0.40 (package @@ -2822,19 +4112,19 @@ Rust implementation of Git.") (define-public rust-gix-quote-0.4 (package (name "rust-gix-quote") - (version "0.4.10") + (version "0.4.12") (source (origin (method url-fetch) (uri (crate-uri "gix-quote" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "07rjs58hp9mi41dpkd8idczaqdmhi08zi0pv206rcfnp0c1w2zcz")))) + (base32 "1zyrl6qchw2f6j25ian699ifzas3a5a2zrhflwjpmym3ksdlzzyb")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-bstr" ,rust-bstr-1) - ("rust-btoi" ,rust-btoi-0.4) + ("rust-gix-utils" ,rust-gix-utils-0.1) ("rust-thiserror" ,rust-thiserror-1)))) (home-page "https://github.com/Byron/gitoxide") (synopsis "Various quotations used by git") @@ -2843,8 +4133,74 @@ Rust implementation of Git.") quotations used by git.") (license (list license:expat license:asl2.0)))) +(define-public rust-gix-ref-0.40 + (package + (name "rust-gix-ref") + (version "0.40.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "gix-ref" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0j96yj1j6mr06qspgxjdssssbf7dzj2bxz5224sqz3b3hhcvvnb4")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; undeclared crate gix_testtools + #:cargo-inputs (("rust-document-features" ,rust-document-features-0.2) + ("rust-gix-actor" ,rust-gix-actor-0.29) + ("rust-gix-date" ,rust-gix-date-0.8) + ("rust-gix-features" ,rust-gix-features-0.37) + ("rust-gix-fs" ,rust-gix-fs-0.9) + ("rust-gix-hash" ,rust-gix-hash-0.14) + ("rust-gix-lock" ,rust-gix-lock-12) + ("rust-gix-object" ,rust-gix-object-0.40) + ("rust-gix-path" ,rust-gix-path-0.10) + ("rust-gix-tempfile" ,rust-gix-tempfile-12) + ("rust-gix-validate" ,rust-gix-validate-0.8) + ("rust-memmap2" ,rust-memmap2-0.9) + ("rust-serde" ,rust-serde-1) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-winnow" ,rust-winnow-0.5)))) + (home-page "https://github.com/Byron/gitoxide") + (synopsis "Part of Gitoxide, this crate handles Git references") + (description "This package provides a crate to handle git references. +Part of Gitoxide, a project to create a pure Rust Git implementation.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-gix-ref-0.39 + (package + (inherit rust-gix-ref-0.40) + (name "rust-gix-ref") + (version "0.39.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "gix-ref" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1zmvbjqg7b46banbp7a7507wa1mx992gcmgg2wrpzkqjqannj81v")))) + (arguments + `(#:tests? #f ; undeclared crate gix_testtools + #:cargo-inputs (("rust-document-features" ,rust-document-features-0.2) + ("rust-gix-actor" ,rust-gix-actor-0.28) + ("rust-gix-date" ,rust-gix-date-0.8) + ("rust-gix-features" ,rust-gix-features-0.36) + ("rust-gix-fs" ,rust-gix-fs-0.8) + ("rust-gix-hash" ,rust-gix-hash-0.13) + ("rust-gix-lock" ,rust-gix-lock-11) + ("rust-gix-object" ,rust-gix-object-0.39) + ("rust-gix-path" ,rust-gix-path-0.10) + ("rust-gix-tempfile" ,rust-gix-tempfile-11) + ("rust-gix-validate" ,rust-gix-validate-0.8) + ("rust-memmap2" ,rust-memmap2-0.9) + ("rust-serde" ,rust-serde-1) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-winnow" ,rust-winnow-0.5)))))) + (define-public rust-gix-ref-0.38 (package + (inherit rust-gix-ref-0.39) (name "rust-gix-ref") (version "0.38.0") (source @@ -2854,7 +4210,6 @@ quotations used by git.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "0ljasz4v4bikrb06wdp7hafznmhqh0zgmqvy02w2z3f8gb8gdhhf")))) - (build-system cargo-build-system) (arguments `(#:tests? #f ; undeclared crate gix_testtools #:cargo-inputs (("rust-document-features" ,rust-document-features-0.2) @@ -2871,12 +4226,7 @@ quotations used by git.") ("rust-memmap2" ,rust-memmap2-0.7) ("rust-serde" ,rust-serde-1) ("rust-thiserror" ,rust-thiserror-1) - ("rust-winnow" ,rust-winnow-0.5)))) - (home-page "https://github.com/Byron/gitoxide") - (synopsis "Part of Gitoxide, this crate handles Git references") - (description "This package provides a crate to handle git references. -Part of Gitoxide, a project to create a pure Rust Git implementation.") - (license (list license:expat license:asl2.0)))) + ("rust-winnow" ,rust-winnow-0.5)))))) (define-public rust-gix-ref-0.37 (package @@ -2940,22 +4290,22 @@ Part of Gitoxide, a project to create a pure Rust Git implementation.") #:cargo-development-inputs (("rust-tempfile" ,rust-tempfile-3)))))) -(define-public rust-gix-refspec-0.19 +(define-public rust-gix-refspec-0.21 (package (name "rust-gix-refspec") - (version "0.19.0") + (version "0.21.1") (source (origin (method url-fetch) (uri (crate-uri "gix-refspec" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1rx6q4k13zciaajz9a6g1wb1w70y92m6fzqc30xb9g8xqi69gc6c")))) + (base32 "01771g6dr5jqg9p1pvl6d7m5x52yfzgwqgm5namka5rc17srs8dy")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-bstr" ,rust-bstr-1) - ("rust-gix-hash" ,rust-gix-hash-0.13) - ("rust-gix-revision" ,rust-gix-revision-0.23) + ("rust-gix-hash" ,rust-gix-hash-0.14) + ("rust-gix-revision" ,rust-gix-revision-0.25) ("rust-gix-validate" ,rust-gix-validate-0.8) ("rust-smallvec" ,rust-smallvec-1) ("rust-thiserror" ,rust-thiserror-1)))) @@ -2966,6 +4316,46 @@ Part of Gitoxide, a project to create a pure Rust Git implementation.") a pure Rust implementation of Git.") (license (list license:expat license:asl2.0)))) +(define-public rust-gix-refspec-0.20 + (package + (inherit rust-gix-refspec-0.21) + (name "rust-gix-refspec") + (version "0.20.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "gix-refspec" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1vivb1g2ispw1mgibnq7yirvqbbclxgfldqwvk08zrqy5swd7nbn")))) + (arguments + `(#:cargo-inputs (("rust-bstr" ,rust-bstr-1) + ("rust-gix-hash" ,rust-gix-hash-0.13) + ("rust-gix-revision" ,rust-gix-revision-0.24) + ("rust-gix-validate" ,rust-gix-validate-0.8) + ("rust-smallvec" ,rust-smallvec-1) + ("rust-thiserror" ,rust-thiserror-1)))))) + +(define-public rust-gix-refspec-0.19 + (package + (inherit rust-gix-refspec-0.20) + (name "rust-gix-refspec") + (version "0.19.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "gix-refspec" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1rx6q4k13zciaajz9a6g1wb1w70y92m6fzqc30xb9g8xqi69gc6c")))) + (arguments + `(#:cargo-inputs (("rust-bstr" ,rust-bstr-1) + ("rust-gix-hash" ,rust-gix-hash-0.13) + ("rust-gix-revision" ,rust-gix-revision-0.23) + ("rust-gix-validate" ,rust-gix-validate-0.8) + ("rust-smallvec" ,rust-smallvec-1) + ("rust-thiserror" ,rust-thiserror-1)))))) + (define-public rust-gix-refspec-0.18 (package (inherit rust-gix-refspec-0.19) @@ -3007,26 +4397,26 @@ a pure Rust implementation of Git.") ("rust-smallvec" ,rust-smallvec-1) ("rust-thiserror" ,rust-thiserror-1)))))) -(define-public rust-gix-revision-0.23 +(define-public rust-gix-revision-0.25 (package (name "rust-gix-revision") - (version "0.23.0") + (version "0.25.1") (source (origin (method url-fetch) (uri (crate-uri "gix-revision" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1215fz886j5gzf31kg32g566vm9pds5679d4d9vg79sr6k3pma9c")))) + (base32 "17ydyj6f75zsz6ygmh3im4631cdx5b58spxi9myr7g1k6vgy2y5a")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-bstr" ,rust-bstr-1) ("rust-document-features" ,rust-document-features-0.2) ("rust-gix-date" ,rust-gix-date-0.8) - ("rust-gix-hash" ,rust-gix-hash-0.13) - ("rust-gix-hashtable" ,rust-gix-hashtable-0.4) - ("rust-gix-object" ,rust-gix-object-0.38) - ("rust-gix-revwalk" ,rust-gix-revwalk-0.9) + ("rust-gix-hash" ,rust-gix-hash-0.14) + ("rust-gix-hashtable" ,rust-gix-hashtable-0.5) + ("rust-gix-object" ,rust-gix-object-0.40) + ("rust-gix-revwalk" ,rust-gix-revwalk-0.11) ("rust-gix-trace" ,rust-gix-trace-0.1) ("rust-serde" ,rust-serde-1) ("rust-thiserror" ,rust-thiserror-1)))) @@ -3038,6 +4428,54 @@ a pure Rust implementation of Git.") handles finding names and parsing specifications.") (license (list license:expat license:asl2.0)))) +(define-public rust-gix-revision-0.24 + (package + (inherit rust-gix-revision-0.25) + (name "rust-gix-revision") + (version "0.24.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "gix-revision" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0i4mb8d34ar2g7flwjbnf8vwb0xlzaa078sy66y38m6f20bxapgy")))) + (arguments + `(#:cargo-inputs (("rust-bstr" ,rust-bstr-1) + ("rust-document-features" ,rust-document-features-0.2) + ("rust-gix-date" ,rust-gix-date-0.8) + ("rust-gix-hash" ,rust-gix-hash-0.13) + ("rust-gix-hashtable" ,rust-gix-hashtable-0.4) + ("rust-gix-object" ,rust-gix-object-0.39) + ("rust-gix-revwalk" ,rust-gix-revwalk-0.10) + ("rust-gix-trace" ,rust-gix-trace-0.1) + ("rust-serde" ,rust-serde-1) + ("rust-thiserror" ,rust-thiserror-1)))))) + +(define-public rust-gix-revision-0.23 + (package + (inherit rust-gix-revision-0.24) + (name "rust-gix-revision") + (version "0.23.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "gix-revision" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1215fz886j5gzf31kg32g566vm9pds5679d4d9vg79sr6k3pma9c")))) + (arguments + `(#:cargo-inputs (("rust-bstr" ,rust-bstr-1) + ("rust-document-features" ,rust-document-features-0.2) + ("rust-gix-date" ,rust-gix-date-0.8) + ("rust-gix-hash" ,rust-gix-hash-0.13) + ("rust-gix-hashtable" ,rust-gix-hashtable-0.4) + ("rust-gix-object" ,rust-gix-object-0.38) + ("rust-gix-revwalk" ,rust-gix-revwalk-0.9) + ("rust-gix-trace" ,rust-gix-trace-0.1) + ("rust-serde" ,rust-serde-1) + ("rust-thiserror" ,rust-thiserror-1)))))) + (define-public rust-gix-revision-0.22 (package (inherit rust-gix-revision-0.23) @@ -3088,24 +4526,24 @@ handles finding names and parsing specifications.") ("rust-serde" ,rust-serde-1) ("rust-thiserror" ,rust-thiserror-1)))))) -(define-public rust-gix-revwalk-0.9 +(define-public rust-gix-revwalk-0.11 (package (name "rust-gix-revwalk") - (version "0.9.0") + (version "0.11.1") (source (origin (method url-fetch) (uri (crate-uri "gix-revwalk" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1q7sgvkm0zdpp09v51jgv7c77zff82fvyr82dzc7dmjc5s4qqvd1")))) + (base32 "0pz411j9hpdls77qglgcwxk794pb4fbqnflz460dxg9bbkzfabbh")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs (("rust-gix-commitgraph" ,rust-gix-commitgraph-0.22) + `(#:cargo-inputs (("rust-gix-commitgraph" ,rust-gix-commitgraph-0.23) ("rust-gix-date" ,rust-gix-date-0.8) - ("rust-gix-hash" ,rust-gix-hash-0.13) - ("rust-gix-hashtable" ,rust-gix-hashtable-0.4) - ("rust-gix-object" ,rust-gix-object-0.38) + ("rust-gix-hash" ,rust-gix-hash-0.14) + ("rust-gix-hashtable" ,rust-gix-hashtable-0.5) + ("rust-gix-object" ,rust-gix-object-0.40) ("rust-smallvec" ,rust-smallvec-1) ("rust-thiserror" ,rust-thiserror-1)))) (home-page "https://github.com/Byron/gitoxide") @@ -3115,6 +4553,48 @@ handles finding names and parsing specifications.") Gitoxide, a pure Rust implementation of Git.") (license (list license:expat license:asl2.0)))) +(define-public rust-gix-revwalk-0.10 + (package + (inherit rust-gix-revwalk-0.11) + (name "rust-gix-revwalk") + (version "0.10.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "gix-revwalk" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1pf15qvha76skcyvysmmxfvb7fpq3s716izizmss956ajcjfvm39")))) + (arguments + `(#:cargo-inputs (("rust-gix-commitgraph" ,rust-gix-commitgraph-0.22) + ("rust-gix-date" ,rust-gix-date-0.8) + ("rust-gix-hash" ,rust-gix-hash-0.13) + ("rust-gix-hashtable" ,rust-gix-hashtable-0.4) + ("rust-gix-object" ,rust-gix-object-0.39) + ("rust-smallvec" ,rust-smallvec-1) + ("rust-thiserror" ,rust-thiserror-1)))))) + +(define-public rust-gix-revwalk-0.9 + (package + (inherit rust-gix-revwalk-0.10) + (name "rust-gix-revwalk") + (version "0.9.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "gix-revwalk" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1q7sgvkm0zdpp09v51jgv7c77zff82fvyr82dzc7dmjc5s4qqvd1")))) + (arguments + `(#:cargo-inputs (("rust-gix-commitgraph" ,rust-gix-commitgraph-0.22) + ("rust-gix-date" ,rust-gix-date-0.8) + ("rust-gix-hash" ,rust-gix-hash-0.13) + ("rust-gix-hashtable" ,rust-gix-hashtable-0.4) + ("rust-gix-object" ,rust-gix-object-0.38) + ("rust-smallvec" ,rust-smallvec-1) + ("rust-thiserror" ,rust-thiserror-1)))))) + (define-public rust-gix-revwalk-0.8 (package (inherit rust-gix-revwalk-0.9) @@ -3160,14 +4640,14 @@ Gitoxide, a pure Rust implementation of Git.") (define-public rust-gix-sec-0.10 (package (name "rust-gix-sec") - (version "0.10.4") + (version "0.10.6") (source (origin (method url-fetch) (uri (crate-uri "gix-sec" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1ln6lgb92xq2jlggqn5dkj5dhd3cpjfkk9yb44hmzw7a5x3bzngq")))) + (base32 "18brd8k370ddq19fbq04fkq8ry84b1ar0xz90gfj0fv49ac2gp7x")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-2) @@ -3206,8 +4686,65 @@ Gitoxide, a pure Rust implementation of Git.") #:cargo-development-inputs (("rust-tempfile" ,rust-tempfile-3)))))) +(define-public rust-gix-status-0.4 + (package + (name "rust-gix-status") + (version "0.4.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "gix-status" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "07diw4dvb49m3ip1vh1vn7fx4sdapysbwc5vhzxmc15c9dl70gwh")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-bstr" ,rust-bstr-1) + ("rust-filetime" ,rust-filetime-0.2) + ("rust-gix-features" ,rust-gix-features-0.37) + ("rust-gix-filter" ,rust-gix-filter-0.8) + ("rust-gix-fs" ,rust-gix-fs-0.9) + ("rust-gix-hash" ,rust-gix-hash-0.14) + ("rust-gix-index" ,rust-gix-index-0.28) + ("rust-gix-object" ,rust-gix-object-0.40) + ("rust-gix-path" ,rust-gix-path-0.10) + ("rust-gix-worktree" ,rust-gix-worktree-0.29) + ("rust-thiserror" ,rust-thiserror-1)))) + (home-page "https://github.com/Byron/gitoxide") + (synopsis "Provides @code{git status} functionality") + (description + "This package provides @code{git status} functionality to Gitoxide, a +Rust implementation of Git.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-gix-status-0.3 + (package + (inherit rust-gix-status-0.4) + (name "rust-gix-status") + (version "0.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "gix-status" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "091xhhk3g9ccizv5qw8gdj1h87v6qn84nqd5b7psda9hjd2i2ni5")))) + (arguments + `(#:cargo-inputs (("rust-bstr" ,rust-bstr-1) + ("rust-filetime" ,rust-filetime-0.2) + ("rust-gix-features" ,rust-gix-features-0.36) + ("rust-gix-filter" ,rust-gix-filter-0.7) + ("rust-gix-fs" ,rust-gix-fs-0.8) + ("rust-gix-hash" ,rust-gix-hash-0.13) + ("rust-gix-index" ,rust-gix-index-0.27) + ("rust-gix-object" ,rust-gix-object-0.39) + ("rust-gix-path" ,rust-gix-path-0.10) + ("rust-gix-worktree" ,rust-gix-worktree-0.28) + ("rust-thiserror" ,rust-thiserror-1)))))) + (define-public rust-gix-status-0.2 (package + (inherit rust-gix-status-0.3) (name "rust-gix-status") (version "0.2.0") (source @@ -3217,7 +4754,6 @@ Gitoxide, a pure Rust implementation of Git.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "1c3a1y91444vdl1krhhybhlcb5fmjcwll8g9df1fbg27zcgjfm0w")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-bstr" ,rust-bstr-1) ("rust-filetime" ,rust-filetime-0.2) @@ -3230,13 +4766,7 @@ Gitoxide, a pure Rust implementation of Git.") ("rust-gix-path" ,rust-gix-path-0.10) ("rust-gix-pathspec" ,rust-gix-pathspec-0.4) ("rust-gix-worktree" ,rust-gix-worktree-0.27) - ("rust-thiserror" ,rust-thiserror-1)))) - (home-page "https://github.com/Byron/gitoxide") - (synopsis "Provides @code{git status} functionality") - (description - "This package provides @code{git status} functionality to Gitoxide, a -Rust implementation of Git.") - (license (list license:expat license:asl2.0)))) + ("rust-thiserror" ,rust-thiserror-1)))))) (define-public rust-gix-status-0.1 (package @@ -3262,8 +4792,57 @@ Rust implementation of Git.") ("rust-gix-pathspec" ,rust-gix-pathspec-0.3) ("rust-thiserror" ,rust-thiserror-1)))))) +(define-public rust-gix-submodule-0.7 + (package + (name "rust-gix-submodule") + (version "0.7.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "gix-submodule" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0day1xp9pfxki9cmp0z4kyhh6ygrm427z2f9zkgj9pi2j903im11")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-bstr" ,rust-bstr-1) + ("rust-gix-config" ,rust-gix-config-0.33) + ("rust-gix-path" ,rust-gix-path-0.10) + ("rust-gix-pathspec" ,rust-gix-pathspec-0.5) + ("rust-gix-refspec" ,rust-gix-refspec-0.21) + ("rust-gix-url" ,rust-gix-url-0.26) + ("rust-thiserror" ,rust-thiserror-1)))) + (home-page "https://github.com/Byron/gitoxide") + (synopsis "Functions for dealing with Git submodules") + (description + "Functions for dealing with Git submodules. Part of Gitoxide a pure Rust +implementation of Git.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-gix-submodule-0.6 + (package + (inherit rust-gix-submodule-0.7) + (name "rust-gix-submodule") + (version "0.6.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "gix-submodule" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1y89k2c4isa9r4j9a5mim91dxx69s6ckqrl1i7mwmgcm1bvdg8q2")))) + (arguments + `(#:cargo-inputs (("rust-bstr" ,rust-bstr-1) + ("rust-gix-config" ,rust-gix-config-0.32) + ("rust-gix-path" ,rust-gix-path-0.10) + ("rust-gix-pathspec" ,rust-gix-pathspec-0.4) + ("rust-gix-refspec" ,rust-gix-refspec-0.20) + ("rust-gix-url" ,rust-gix-url-0.25) + ("rust-thiserror" ,rust-thiserror-1)))))) + (define-public rust-gix-submodule-0.5 (package + (inherit rust-gix-submodule-0.6) (name "rust-gix-submodule") (version "0.5.0") (source @@ -3273,7 +4852,6 @@ Rust implementation of Git.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "1hm1d7a9qb3zylln44bxcnmdy27zfajc6gj5g00kf95a2a6qr9xv")))) - (build-system cargo-build-system) (arguments `(#:tests? #f ; undeclared crate gix_testtools #:cargo-inputs (("rust-bstr" ,rust-bstr-1) @@ -3282,13 +4860,7 @@ Rust implementation of Git.") ("rust-gix-pathspec" ,rust-gix-pathspec-0.4) ("rust-gix-refspec" ,rust-gix-refspec-0.19) ("rust-gix-url" ,rust-gix-url-0.25) - ("rust-thiserror" ,rust-thiserror-1)))) - (home-page "https://github.com/Byron/gitoxide") - (synopsis "Functions for dealing with Git submodules") - (description - "Functions for dealing with Git submodules. Part of Gitoxide a pure Rust -implementation of Git.") - (license (list license:expat license:asl2.0)))) + ("rust-thiserror" ,rust-thiserror-1)))))) (define-public rust-gix-submodule-0.4 (package @@ -3312,22 +4884,22 @@ implementation of Git.") ("rust-gix-url" ,rust-gix-url-0.24) ("rust-thiserror" ,rust-thiserror-1)))))) -(define-public rust-gix-tempfile-11 +(define-public rust-gix-tempfile-12 (package (name "rust-gix-tempfile") - (version "11.0.1") + (version "12.0.1") (source (origin (method url-fetch) (uri (crate-uri "gix-tempfile" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "08vykvfdgxvqqm63zav1rw730qm6cdnnvqni52dwcvm82j8x539q")))) + (base32 "1aiypbizzx997lw8yvz2sk4nnmxz1yq233j5kc8my7wbf5nkgvx8")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-dashmap" ,rust-dashmap-5) ("rust-document-features" ,rust-document-features-0.2) - ("rust-gix-fs" ,rust-gix-fs-0.8) + ("rust-gix-fs" ,rust-gix-fs-0.9) ("rust-libc" ,rust-libc-0.2) ("rust-once-cell" ,rust-once-cell-1) ("rust-parking-lot" ,rust-parking-lot-0.12) @@ -3341,6 +4913,29 @@ implementation of Git.") tempfile capability with a global registry to assure clean-up.") (license (list license:expat license:asl2.0)))) +(define-public rust-gix-tempfile-11 + (package + (inherit rust-gix-tempfile-12) + (name "rust-gix-tempfile") + (version "11.0.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "gix-tempfile" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "08vykvfdgxvqqm63zav1rw730qm6cdnnvqni52dwcvm82j8x539q")))) + (arguments + `(#:cargo-inputs (("rust-dashmap" ,rust-dashmap-5) + ("rust-document-features" ,rust-document-features-0.2) + ("rust-gix-fs" ,rust-gix-fs-0.8) + ("rust-libc" ,rust-libc-0.2) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-parking-lot" ,rust-parking-lot-0.12) + ("rust-signal-hook" ,rust-signal-hook-0.3) + ("rust-signal-hook-registry" ,rust-signal-hook-registry-1) + ("rust-tempfile" ,rust-tempfile-3)))))) + (define-public rust-gix-tempfile-10 (package (inherit rust-gix-tempfile-11) @@ -3391,14 +4986,14 @@ tempfile capability with a global registry to assure clean-up.") (define-public rust-gix-trace-0.1 (package (name "rust-gix-trace") - (version "0.1.7") + (version "0.1.8") (source (origin (method url-fetch) (uri (crate-uri "gix-trace" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1cd9288nj861b9ixm0pd79rsvn4avafaiiicdrczrzm7cvbh5ch2")))) + (base32 "1ay5zplv97jysfs2ra214zizwrqv4n6w5943si3r8b7np0nqp0wv")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs @@ -3411,8 +5006,87 @@ tempfile capability with a global registry to assure clean-up.") can be turned off to zero cost.") (license (list license:expat license:asl2.0)))) +(define-public rust-gix-transport-0.40 + (package + (name "rust-gix-transport") + (version "0.40.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "gix-transport" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0w4pngjzbyvm68affvglnkzcyksgv5wxivnakx05lfg9acha40dy")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-async-std" ,rust-async-std-1) + ("rust-async-trait" ,rust-async-trait-0.1) + ("rust-base64" ,rust-base64-0.21) + ("rust-bstr" ,rust-bstr-1) + ("rust-curl" ,rust-curl-0.4) + ("rust-document-features" ,rust-document-features-0.2) + ("rust-futures-io" ,rust-futures-io-0.3) + ("rust-futures-lite" ,rust-futures-lite-2) + ("rust-gix-command" ,rust-gix-command-0.3) + ("rust-gix-credentials" ,rust-gix-credentials-0.23) + ("rust-gix-features" ,rust-gix-features-0.37) + ("rust-gix-packetline" ,rust-gix-packetline-0.17) + ("rust-gix-quote" ,rust-gix-quote-0.4) + ("rust-gix-sec" ,rust-gix-sec-0.10) + ("rust-gix-url" ,rust-gix-url-0.26) + ("rust-pin-project-lite" ,rust-pin-project-lite-0.2) + ("rust-reqwest" ,rust-reqwest-0.11) + ("rust-serde" ,rust-serde-1) + ("rust-thiserror" ,rust-thiserror-1)) + #:cargo-development-inputs (("rust-async-std" ,rust-async-std-1) + ("rust-blocking" ,rust-blocking-1) + ("rust-maybe-async" ,rust-maybe-async-0.2)))) + (home-page "https://github.com/Byron/gitoxide") + (synopsis "Implements the Git transport layer for Gitoxide") + (description + "This package is part of Gitoxide a Rust implementation of Git. It +provides an implementation of the Git transport layer.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-gix-transport-0.39 + (package + (inherit rust-gix-transport-0.40) + (name "rust-gix-transport") + (version "0.39.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "gix-transport" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0i5ig30l4gqyh70qhm1gdmm2aa3qf33galr0vp36h96nqkpwycgp")))) + (arguments + `(#:cargo-inputs (("rust-async-std" ,rust-async-std-1) + ("rust-async-trait" ,rust-async-trait-0.1) + ("rust-base64" ,rust-base64-0.21) + ("rust-bstr" ,rust-bstr-1) + ("rust-curl" ,rust-curl-0.4) + ("rust-document-features" ,rust-document-features-0.2) + ("rust-futures-io" ,rust-futures-io-0.3) + ("rust-futures-lite" ,rust-futures-lite-1) + ("rust-gix-command" ,rust-gix-command-0.3) + ("rust-gix-credentials" ,rust-gix-credentials-0.22) + ("rust-gix-features" ,rust-gix-features-0.36) + ("rust-gix-packetline" ,rust-gix-packetline-0.17) + ("rust-gix-quote" ,rust-gix-quote-0.4) + ("rust-gix-sec" ,rust-gix-sec-0.10) + ("rust-gix-url" ,rust-gix-url-0.25) + ("rust-pin-project-lite" ,rust-pin-project-lite-0.2) + ("rust-reqwest" ,rust-reqwest-0.11) + ("rust-serde" ,rust-serde-1) + ("rust-thiserror" ,rust-thiserror-1)) + #:cargo-development-inputs (("rust-async-std" ,rust-async-std-1) + ("rust-blocking" ,rust-blocking-1) + ("rust-maybe-async" ,rust-maybe-async-0.2)))))) + (define-public rust-gix-transport-0.38 (package + (inherit rust-gix-transport-0.39) (name "rust-gix-transport") (version "0.38.0") (source @@ -3422,7 +5096,6 @@ can be turned off to zero cost.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "0lp7bg7pj9l2na92bdrbx0zjybi7j88c26vm341z492f6s9rl81g")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-async-std" ,rust-async-std-1) ("rust-async-trait" ,rust-async-trait-0.1) @@ -3445,13 +5118,7 @@ can be turned off to zero cost.") ("rust-thiserror" ,rust-thiserror-1)) #:cargo-development-inputs (("rust-async-std" ,rust-async-std-1) ("rust-blocking" ,rust-blocking-1) - ("rust-maybe-async" ,rust-maybe-async-0.2)))) - (home-page "https://github.com/Byron/gitoxide") - (synopsis "Implements the Git transport layer for Gitoxide") - (description - "This package is part of Gitoxide a Rust implementation of Git. It -provides an implementation of the Git transport layer.") - (license (list license:expat license:asl2.0)))) + ("rust-maybe-async" ,rust-maybe-async-0.2)))))) (define-public rust-gix-transport-0.37 (package @@ -3529,8 +5196,58 @@ provides an implementation of the Git transport layer.") ("rust-blocking" ,rust-blocking-1) ("rust-maybe-async" ,rust-maybe-async-0.2)))))) +(define-public rust-gix-traverse-0.36 + (package + (name "rust-gix-traverse") + (version "0.36.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "gix-traverse" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0qbiq230wj8ak60zzg613pgflwnvsyj71x9liys0k957bd29w435")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-gix-commitgraph" ,rust-gix-commitgraph-0.23) + ("rust-gix-date" ,rust-gix-date-0.8) + ("rust-gix-hash" ,rust-gix-hash-0.14) + ("rust-gix-hashtable" ,rust-gix-hashtable-0.5) + ("rust-gix-object" ,rust-gix-object-0.40) + ("rust-gix-revwalk" ,rust-gix-revwalk-0.11) + ("rust-smallvec" ,rust-smallvec-1) + ("rust-thiserror" ,rust-thiserror-1)))) + (home-page "https://github.com/Byron/gitoxide") + (synopsis "Ways to traverse Git commit graphs and trees for Gix") + (description "Part of Gitoxide, a pure Rust implementation of Git. This +package is used to traverse Git commit graphs and trees.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-gix-traverse-0.35 + (package + (inherit rust-gix-traverse-0.36) + (name "rust-gix-traverse") + (version "0.35.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "gix-traverse" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0x04z3xybwkr6wls0rpdr8n3pdhd091bsky8j9jj1812h44148fz")))) + (arguments + `(#:cargo-inputs (("rust-gix-commitgraph" ,rust-gix-commitgraph-0.22) + ("rust-gix-date" ,rust-gix-date-0.8) + ("rust-gix-hash" ,rust-gix-hash-0.13) + ("rust-gix-hashtable" ,rust-gix-hashtable-0.4) + ("rust-gix-object" ,rust-gix-object-0.39) + ("rust-gix-revwalk" ,rust-gix-revwalk-0.10) + ("rust-smallvec" ,rust-smallvec-1) + ("rust-thiserror" ,rust-thiserror-1)))))) + (define-public rust-gix-traverse-0.34 (package + (inherit rust-gix-traverse-0.35) (name "rust-gix-traverse") (version "0.34.0") (source @@ -3540,7 +5257,6 @@ provides an implementation of the Git transport layer.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "12pk1w89kj978jdfsg2fwmq5p4gv0i0wydh6pxmbf6sfgpn51l0l")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-gix-commitgraph" ,rust-gix-commitgraph-0.22) ("rust-gix-date" ,rust-gix-date-0.8) @@ -3549,12 +5265,7 @@ provides an implementation of the Git transport layer.") ("rust-gix-object" ,rust-gix-object-0.38) ("rust-gix-revwalk" ,rust-gix-revwalk-0.9) ("rust-smallvec" ,rust-smallvec-1) - ("rust-thiserror" ,rust-thiserror-1)))) - (home-page "https://github.com/Byron/gitoxide") - (synopsis "Ways to traverse Git commit graphs and trees for Gix") - (description "Part of Gitoxide, a pure Rust implementation of Git. This -package is used to traverse Git commit graphs and trees.") - (license (list license:expat license:asl2.0)))) + ("rust-thiserror" ,rust-thiserror-1)))))) (define-public rust-gix-traverse-0.33 (package @@ -3597,28 +5308,29 @@ package is used to traverse Git commit graphs and trees.") ("rust-gix-object" ,rust-gix-object-0.30) ("rust-thiserror" ,rust-thiserror-1)))))) -(define-public rust-gix-url-0.25 +(define-public rust-gix-url-0.26 (package (name "rust-gix-url") - (version "0.25.2") + (version "0.26.1") (source (origin (method url-fetch) (uri (crate-uri "gix-url" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "01a0phpk3f0lrhavqm51cgpdwh925i2djiyslaj57ync24d7lhhc")))) + (base32 "0i6wjjaq1yhxqk9gbriv9raldhs04yy91ipys4qs4lkmxg61f3wg")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-bstr" ,rust-bstr-1) ("rust-document-features" ,rust-document-features-0.2) - ("rust-gix-features" ,rust-gix-features-0.36) + ("rust-gix-features" ,rust-gix-features-0.37) ("rust-gix-path" ,rust-gix-path-0.10) ("rust-home" ,rust-home-0.5) ("rust-serde" ,rust-serde-1) ("rust-thiserror" ,rust-thiserror-1) ("rust-url" ,rust-url-2)) - #:cargo-development-inputs (("rust-assert-matches" ,rust-assert-matches-1)))) + #:cargo-development-inputs + (("rust-assert-matches" ,rust-assert-matches-1)))) (home-page "https://github.com/Byron/gitoxide") (synopsis "This crate implements parsing and serialization of gix-url for Gitoxide") @@ -3627,6 +5339,30 @@ package is used to traverse Git commit graphs and trees.") provides a crate for parsing and serialization of gix-url's.") (license (list license:expat license:asl2.0)))) +(define-public rust-gix-url-0.25 + (package + (inherit rust-gix-url-0.26) + (name "rust-gix-url") + (version "0.25.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "gix-url" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "01a0phpk3f0lrhavqm51cgpdwh925i2djiyslaj57ync24d7lhhc")))) + (arguments + `(#:cargo-inputs (("rust-bstr" ,rust-bstr-1) + ("rust-document-features" ,rust-document-features-0.2) + ("rust-gix-features" ,rust-gix-features-0.36) + ("rust-gix-path" ,rust-gix-path-0.10) + ("rust-home" ,rust-home-0.5) + ("rust-serde" ,rust-serde-1) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-url" ,rust-url-2)) + #:cargo-development-inputs + (("rust-assert-matches" ,rust-assert-matches-1)))))) + (define-public rust-gix-url-0.24 (package (inherit rust-gix-url-0.25) @@ -3678,18 +5414,19 @@ provides a crate for parsing and serialization of gix-url's.") (define-public rust-gix-utils-0.1 (package (name "rust-gix-utils") - (version "0.1.9") + (version "0.1.11") (source (origin (method url-fetch) (uri (crate-uri "gix-utils" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1f3a4slyvxw72b1xz988h3ppd8c0wyzacg9625j2k2vrs3rkks2n")))) + (base32 "14lg6k6v3pqb9y3zq3j1r9l1ycx5grcrl9wiy1vrhzr79hnl6rh0")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs - (("rust-fastrand" ,rust-fastrand-2) + (("rust-bstr" ,rust-bstr-1) + ("rust-fastrand" ,rust-fastrand-2) ("rust-unicode-normalization" ,rust-unicode-normalization-0.1)))) (home-page "https://github.com/Byron/gitoxide") (synopsis @@ -3702,14 +5439,14 @@ feature toggles.") (define-public rust-gix-validate-0.8 (package (name "rust-gix-validate") - (version "0.8.3") + (version "0.8.4") (source (origin (method url-fetch) (uri (crate-uri "gix-validate" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0m1qi0xp59sa3540zdhdshjhfj44nsdjiyd0vindkmbb95pw6z5c")))) + (base32 "0i8m4jv53yn8nhp2niifb03p6lcyj1sd8d6x36n5x624c3hcd7z3")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-bstr" ,rust-bstr-1) @@ -3737,8 +5474,68 @@ package contains validation functions for various kinds of names in Git.") (("rust-bstr" ,rust-bstr-1) ("rust-thiserror" ,rust-thiserror-1)))))) +(define-public rust-gix-worktree-0.29 + (package + (name "rust-gix-worktree") + (version "0.29.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "gix-worktree" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0lld035lsx3y0d2qxpnys2j63nhl36510i76k6arly7hpy52z62k")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-bstr" ,rust-bstr-1) + ("rust-document-features" ,rust-document-features-0.2) + ("rust-gix-attributes" ,rust-gix-attributes-0.21) + ("rust-gix-features" ,rust-gix-features-0.37) + ("rust-gix-fs" ,rust-gix-fs-0.9) + ("rust-gix-glob" ,rust-gix-glob-0.15) + ("rust-gix-hash" ,rust-gix-hash-0.14) + ("rust-gix-ignore" ,rust-gix-ignore-0.10) + ("rust-gix-index" ,rust-gix-index-0.28) + ("rust-gix-object" ,rust-gix-object-0.40) + ("rust-gix-path" ,rust-gix-path-0.10) + ("rust-serde" ,rust-serde-1)))) + (home-page "https://github.com/Byron/gitoxide") + (synopsis + "Gitoxide functions for handling shared Git worktree types and utilities") + (description + "This package provides functions for handling shared Git worktree related +types and utilities. Part of Gitoxide a pure Rust implementation of Git.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-gix-worktree-0.28 + (package + (inherit rust-gix-worktree-0.29) + (name "rust-gix-worktree") + (version "0.28.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "gix-worktree" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1d30k1748k5zdxa24ifww9ym16lga7bphz8ir3lan57f3ph0l7bz")))) + (arguments + `(#:cargo-inputs (("rust-bstr" ,rust-bstr-1) + ("rust-document-features" ,rust-document-features-0.2) + ("rust-gix-attributes" ,rust-gix-attributes-0.20) + ("rust-gix-features" ,rust-gix-features-0.36) + ("rust-gix-fs" ,rust-gix-fs-0.8) + ("rust-gix-glob" ,rust-gix-glob-0.14) + ("rust-gix-hash" ,rust-gix-hash-0.13) + ("rust-gix-ignore" ,rust-gix-ignore-0.9) + ("rust-gix-index" ,rust-gix-index-0.27) + ("rust-gix-object" ,rust-gix-object-0.39) + ("rust-gix-path" ,rust-gix-path-0.10) + ("rust-serde" ,rust-serde-1)))))) + (define-public rust-gix-worktree-0.27 (package + (inherit rust-gix-worktree-0.28) (name "rust-gix-worktree") (version "0.27.0") (source @@ -3748,7 +5545,6 @@ package contains validation functions for various kinds of names in Git.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "1zfpqbrxxwjjhjk1rn60rmajxm4f7ix2jbx44vklz9nv47kpkbyx")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-bstr" ,rust-bstr-1) ("rust-document-features" ,rust-document-features-0.2) @@ -3761,14 +5557,7 @@ package contains validation functions for various kinds of names in Git.") ("rust-gix-index" ,rust-gix-index-0.26) ("rust-gix-object" ,rust-gix-object-0.38) ("rust-gix-path" ,rust-gix-path-0.10) - ("rust-serde" ,rust-serde-1)))) - (home-page "https://github.com/Byron/gitoxide") - (synopsis - "Gitoxide functions for handling shared Git worktree types and utilities") - (description - "This package provides functions for handling shared Git worktree related -types and utilities. Part of Gitoxide a pure Rust implementation of Git.") - (license (list license:expat license:asl2.0)))) + ("rust-serde" ,rust-serde-1)))))) (define-public rust-gix-worktree-0.26 (package @@ -3830,8 +5619,68 @@ types and utilities. Part of Gitoxide a pure Rust implementation of Git.") ("rust-tempfile" ,rust-tempfile-3) ("rust-walkdir" ,rust-walkdir-2)))))) +(define-public rust-gix-worktree-state-0.6 + (package + (name "rust-gix-worktree-state") + (version "0.6.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "gix-worktree-state" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1890rq778ac6va1pki0d4379mpinirs892z71hvm3h1449rlxiyq")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-bstr" ,rust-bstr-1) + ("rust-gix-features" ,rust-gix-features-0.37) + ("rust-gix-filter" ,rust-gix-filter-0.8) + ("rust-gix-fs" ,rust-gix-fs-0.9) + ("rust-gix-glob" ,rust-gix-glob-0.15) + ("rust-gix-hash" ,rust-gix-hash-0.14) + ("rust-gix-index" ,rust-gix-index-0.28) + ("rust-gix-object" ,rust-gix-object-0.40) + ("rust-gix-path" ,rust-gix-path-0.10) + ("rust-gix-worktree" ,rust-gix-worktree-0.29) + ("rust-io-close" ,rust-io-close-0.3) + ("rust-thiserror" ,rust-thiserror-1)))) + (home-page "https://github.com/Byron/gitoxide") + (synopsis + "Gitoxide project functions that set Git's worktree to a particular state") + (description + "This package provides functions for setting the Git worktree to a particular +state. Used by Gitoxide a pure Rust implementation of Git.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-gix-worktree-state-0.5 + (package + (inherit rust-gix-worktree-state-0.6) + (name "rust-gix-worktree-state") + (version "0.5.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "gix-worktree-state" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "00gsa6vzxc8ya5h9yp33wa668ak6ah95llcilfycy331zqf3rvxg")))) + (arguments + `(#:cargo-inputs (("rust-bstr" ,rust-bstr-1) + ("rust-gix-features" ,rust-gix-features-0.36) + ("rust-gix-filter" ,rust-gix-filter-0.7) + ("rust-gix-fs" ,rust-gix-fs-0.8) + ("rust-gix-glob" ,rust-gix-glob-0.14) + ("rust-gix-hash" ,rust-gix-hash-0.13) + ("rust-gix-index" ,rust-gix-index-0.27) + ("rust-gix-object" ,rust-gix-object-0.39) + ("rust-gix-path" ,rust-gix-path-0.10) + ("rust-gix-worktree" ,rust-gix-worktree-0.28) + ("rust-io-close" ,rust-io-close-0.3) + ("rust-thiserror" ,rust-thiserror-1)))))) + (define-public rust-gix-worktree-state-0.4 (package + (inherit rust-gix-worktree-state-0.5) (name "rust-gix-worktree-state") (version "0.4.0") (source @@ -3841,7 +5690,6 @@ types and utilities. Part of Gitoxide a pure Rust implementation of Git.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "1m5y0qsf8r7sl6ffvi5ymd6497a5mb4k3pq31b072g5gvk6gr8il")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-bstr" ,rust-bstr-1) ("rust-gix-features" ,rust-gix-features-0.36) @@ -3854,14 +5702,7 @@ types and utilities. Part of Gitoxide a pure Rust implementation of Git.") ("rust-gix-path" ,rust-gix-path-0.10) ("rust-gix-worktree" ,rust-gix-worktree-0.27) ("rust-io-close" ,rust-io-close-0.3) - ("rust-thiserror" ,rust-thiserror-1)))) - (home-page "https://github.com/Byron/gitoxide") - (synopsis - "Gitoxide project functions that set Git's worktree to a particular state") - (description - "This package provides functions for setting the Git worktree to a particular -state. Used by Gitoxide a pure Rust implementation of Git.") - (license (list license:expat license:asl2.0)))) + ("rust-thiserror" ,rust-thiserror-1)))))) (define-public rust-gix-worktree-state-0.3 (package @@ -3889,8 +5730,62 @@ state. Used by Gitoxide a pure Rust implementation of Git.") ("rust-io-close" ,rust-io-close-0.3) ("rust-thiserror" ,rust-thiserror-1)))))) +(define-public rust-gix-worktree-stream-0.8 + (package + (name "rust-gix-worktree-stream") + (version "0.8.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "gix-worktree-stream" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "05qb9603wdv15l3h27i9s657j6yrpdnnli0x9x9jvkcas98jk1mg")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-gix-attributes" ,rust-gix-attributes-0.21) + ("rust-gix-features" ,rust-gix-features-0.37) + ("rust-gix-filter" ,rust-gix-filter-0.8) + ("rust-gix-fs" ,rust-gix-fs-0.9) + ("rust-gix-hash" ,rust-gix-hash-0.14) + ("rust-gix-object" ,rust-gix-object-0.40) + ("rust-gix-path" ,rust-gix-path-0.10) + ("rust-gix-traverse" ,rust-gix-traverse-0.36) + ("rust-parking-lot" ,rust-parking-lot-0.12) + ("rust-thiserror" ,rust-thiserror-1)))) + (home-page "https://github.com/Byron/gitoxide") + (synopsis "This crate generates a byte-stream from a git-tree") + (description "This crate provides the ability to generate a byte-stream +from a git-tree. It's part of Gitoxide, a pure Rust implementation of Git.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-gix-worktree-stream-0.7 + (package + (inherit rust-gix-worktree-stream-0.8) + (name "rust-gix-worktree-stream") + (version "0.7.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "gix-worktree-stream" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0v0hcsljsiw2c3vcjc5gvgd4iyw9m84h5cpc1fh960fkkqk3qy1w")))) + (arguments + `(#:cargo-inputs (("rust-gix-attributes" ,rust-gix-attributes-0.20) + ("rust-gix-features" ,rust-gix-features-0.36) + ("rust-gix-filter" ,rust-gix-filter-0.7) + ("rust-gix-fs" ,rust-gix-fs-0.8) + ("rust-gix-hash" ,rust-gix-hash-0.13) + ("rust-gix-object" ,rust-gix-object-0.39) + ("rust-gix-path" ,rust-gix-path-0.10) + ("rust-gix-traverse" ,rust-gix-traverse-0.35) + ("rust-parking-lot" ,rust-parking-lot-0.12) + ("rust-thiserror" ,rust-thiserror-1)))))) + (define-public rust-gix-worktree-stream-0.6 (package + (inherit rust-gix-worktree-stream-0.7) (name "rust-gix-worktree-stream") (version "0.6.0") (source @@ -3900,7 +5795,6 @@ state. Used by Gitoxide a pure Rust implementation of Git.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "0b5gf6pq9ypxhg0x9dj9b1agrhbj7rz64r10d0kp6d69z2v38jzf")))) - (build-system cargo-build-system) (arguments `(#:tests? #f ; using undeclared crates gix_worktree/gix_testtools #:cargo-inputs (("rust-gix-attributes" ,rust-gix-attributes-0.20) @@ -3912,12 +5806,7 @@ state. Used by Gitoxide a pure Rust implementation of Git.") ("rust-gix-path" ,rust-gix-path-0.10) ("rust-gix-traverse" ,rust-gix-traverse-0.34) ("rust-parking-lot" ,rust-parking-lot-0.12) - ("rust-thiserror" ,rust-thiserror-1)))) - (home-page "https://github.com/Byron/gitoxide") - (synopsis "This crate generates a byte-stream from a git-tree") - (description "This crate provides the ability to generate a byte-stream -from a git-tree. It's part of Gitoxide, a pure Rust implementation of Git.") - (license (list license:expat license:asl2.0)))) + ("rust-thiserror" ,rust-thiserror-1)))))) (define-public rust-gix-worktree-stream-0.5 (package @@ -3947,14 +5836,14 @@ from a git-tree. It's part of Gitoxide, a pure Rust implementation of Git.") (define-public rust-libgit2-sys-0.16 (package (name "rust-libgit2-sys") - (version "0.16.1+1.7.1") + (version "0.16.2+1.7.2") (source (origin (method url-fetch) (uri (crate-uri "libgit2-sys" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "030dnq7hz79qs4rxdllc3ailvqzc432jwwxk7g8av55hh0vbp8pj")) + (base32 "1s149nkximw3n42925rp0jax1sf1zmf8gpcim2g9sp7fnkc2chgf")) (modules '((guix build utils))) (snippet #~(begin (delete-file-recursively "libgit2"))))) diff --git a/gnu/packages/crates-web.scm b/gnu/packages/crates-web.scm index 60c735efa7..ee32c99374 100644 --- a/gnu/packages/crates-web.scm +++ b/gnu/packages/crates-web.scm @@ -3,12 +3,13 @@ ;;; Copyright © 2020 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2020 John Soo <jsoo1@asu.edu> ;;; Copyright © 2020, 2023, 2024 Efraim Flashner <efraim@flashner.co.il> -;;; Copyright © 2020-2022 Nicolas Goaziou <mail@nicolasgoaziou.fr> +;;; Copyright © 2020-2022, 2024 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2022 Aleksandr Vityazev <avityazev@posteo.org> ;;; Copyright © 2023 Steve George <steve@futurile.net> ;;; Copyright © 2023 VÖRÖSKŐI András <voroskoi@gmail.com> ;;; Copyright © 2024 Wilko Meyer <w@wmeyer.eu> ;;; Copyright © 2024 Tomas Volf <~@wolfsden.cz> +;;; Copyright © 2024 Nguyễn Gia Phong <mcsinyx@disroot.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -120,8 +121,38 @@ #:cargo-development-inputs (("rust-doc-comment" ,rust-doc-comment-0.3)))))) +(define-public rust-actix-codec-0.5 + (package + (name "rust-actix-codec") + (version "0.5.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "actix-codec" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "12m2jxysk2xpxi193340zv4w215cv9fyyna7rxvzh6wck0hhlysz")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; use of undeclared crate or module `tokio_test` + #:cargo-inputs (("rust-bitflags" ,rust-bitflags-2) + ("rust-bytes" ,rust-bytes-1) + ("rust-futures-core" ,rust-futures-core-0.3) + ("rust-futures-sink" ,rust-futures-sink-0.3) + ("rust-memchr" ,rust-memchr-2) + ("rust-pin-project-lite" ,rust-pin-project-lite-0.2) + ("rust-tokio" ,rust-tokio-1) + ("rust-tokio-util" ,rust-tokio-util-0.7) + ("rust-tracing" ,rust-tracing-0.1)))) + (home-page "https://github.com/actix/actix-net") + (synopsis "Codec utilities for working with framed protocols") + (description + "This package provides codec utilities for working with framed protocols.") + (license (list license:expat license:asl2.0)))) + (define-public rust-actix-codec-0.3 (package + (inherit rust-actix-codec-0.5) (name "rust-actix-codec") (version "0.3.0") (source @@ -131,7 +162,6 @@ (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "0w7506qd2f8q83z6l5lqx1363ks0ysx8f7qgvy8fknrq70xq7lbq")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) @@ -141,13 +171,7 @@ ("rust-log" ,rust-log-0.4) ("rust-pin-project" ,rust-pin-project-0.4) ("rust-tokio" ,rust-tokio-0.2) - ("rust-tokio-util" ,rust-tokio-util-0.3)))) - (home-page "https://actix.rs") - (synopsis "Codec utilities for working with framed protocols") - (description - "This package provides codec utilities for working with framed -protocols.") - (license (list license:expat license:asl2.0)))) + ("rust-tokio-util" ,rust-tokio-util-0.3)))))) (define-public rust-actix-codec-0.2 (package @@ -242,11 +266,7 @@ protocols.") (sha256 (base32 "0v77m394gzbrrzg12xkqgli11vwhig0zcxy3yhmq1s91j9bcjp69")))) (arguments - ;; XXX: The crate fails to't build with: "error[E0432]: unresolved import - ;; `trust_dns_resolver::Background`". I assume it really expects - ;; trust-dns-resolver at version 0.18-alpha.2, which we do not provide. - `(#:skip-build? #true - #:cargo-inputs + `(#:cargo-inputs (("rust-actix-codec" ,rust-actix-codec-0.2) ("rust-actix-rt" ,rust-actix-rt-1) ("rust-actix-service" ,rust-actix-service-1) @@ -260,19 +280,11 @@ protocols.") ("rust-rustls" ,rust-rustls-0.16) ("rust-tokio-openssl" ,rust-tokio-openssl-0.4) ("rust-tokio-rustls" ,rust-tokio-rustls-0.12) - ("rust-trust-dns-proto" ,rust-trust-dns-proto-0.18) - ("rust-trust-dns-resolver" ,rust-trust-dns-resolver-0.18) + ("rust-trust-dns-proto" ,rust-trust-dns-proto-0.18.0-alpha.2) + ("rust-trust-dns-resolver" ,rust-trust-dns-resolver-0.18.0-alpha.2) ("rust-webpki" ,rust-webpki-0.21)) #:cargo-development-inputs - (("rust-actix-testing" ,rust-actix-testing-1)) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-version-requirements - (lambda _ - (substitute* "Cargo.toml" - (("0.18.0-alpha.2") - ,(package-version rust-trust-dns-proto-0.18))) - #t))))))) + (("rust-actix-testing" ,rust-actix-testing-1)))))) (define-public rust-actix-connect-0.2 (package @@ -357,8 +369,61 @@ protocols.") ("rust-quote" ,rust-quote-0.6) ("rust-syn" ,rust-syn-0.15)))))) +(define-public rust-actix-http-3 + (package + (name "rust-actix-http") + (version "3.6.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "actix-http" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0hx7rjc1cwrrql5qmihl31hf7nblwyd6a4mvhcghvz41shzv28yj")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; use of undeclared crate or module `once_cell` + #:cargo-inputs (("rust-actix-codec" ,rust-actix-codec-0.5) + ("rust-actix-rt" ,rust-actix-rt-2) + ("rust-actix-service" ,rust-actix-service-2) + ("rust-actix-tls" ,rust-actix-tls-3) + ("rust-actix-utils" ,rust-actix-utils-3) + ("rust-ahash" ,rust-ahash-0.8) + ("rust-base64" ,rust-base64-0.21) + ("rust-bitflags" ,rust-bitflags-2) + ("rust-brotli" ,rust-brotli-3) + ("rust-bytes" ,rust-bytes-1) + ("rust-bytestring" ,rust-bytestring-1) + ("rust-derive-more" ,rust-derive-more-0.99) + ("rust-encoding-rs" ,rust-encoding-rs-0.8) + ("rust-flate2" ,rust-flate2-1) + ("rust-futures-core" ,rust-futures-core-0.3) + ("rust-h2" ,rust-h2-0.3) + ("rust-http" ,rust-http-0.2) + ("rust-httparse" ,rust-httparse-1) + ("rust-httpdate" ,rust-httpdate-1) + ("rust-itoa" ,rust-itoa-1) + ("rust-language-tags" ,rust-language-tags-0.3) + ("rust-local-channel" ,rust-local-channel-0.1) + ("rust-mime" ,rust-mime-0.3) + ("rust-percent-encoding" ,rust-percent-encoding-2) + ("rust-pin-project-lite" ,rust-pin-project-lite-0.2) + ("rust-rand" ,rust-rand-0.8) + ("rust-sha1" ,rust-sha1-0.10) + ("rust-smallvec" ,rust-smallvec-1) + ("rust-tokio" ,rust-tokio-1) + ("rust-tokio-util" ,rust-tokio-util-0.7) + ("rust-tracing" ,rust-tracing-0.1) + ("rust-zstd" ,rust-zstd-0.13)))) + (home-page "https://actix.rs") + (synopsis "HTTP primitives for the Actix ecosystem") + (description + "This package provides HTTP primitives for the Actix ecosystem.") + (license (list license:expat license:asl2.0)))) + (define-public rust-actix-http-2 (package + (inherit rust-actix-http-3) (name "rust-actix-http") (version "2.2.0") (source @@ -368,7 +433,6 @@ protocols.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "0x78h9lzqdhp06v1kf4dhbiqp8sc911w4lqfj5rmdbhpg3l9j8j5")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs @@ -412,12 +476,7 @@ protocols.") ("rust-serde-urlencoded" ,rust-serde-urlencoded-0.7) ("rust-sha-1" ,rust-sha-1-0.9) ("rust-slab" ,rust-slab-0.4) - ("rust-time" ,rust-time-0.2)))) - (home-page "https://actix.rs") - (synopsis "HTTP primitives for the Actix ecosystem") - (description - "This package provides HTTP primitives for the Actix ecosystem.") - (license (list license:expat license:asl2.0)))) + ("rust-time" ,rust-time-0.2)))))) (define-public rust-actix-http-1 (package @@ -674,8 +733,34 @@ during testing.") ("rust-futures-util" ,rust-futures-util-0.3) ("rust-trybuild" ,rust-trybuild-1)))))) +(define-public rust-actix-router-0.5 + (package + (name "rust-actix-router") + (version "0.5.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "actix-router" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "04f5cdag2h9lbrgb0pzwznpfrl3ajbdxlsvb8a2kci1rcmcpa96j")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; cannot find derive macro `Deserialize` in this scope + #:cargo-inputs (("rust-bytestring" ,rust-bytestring-0.1) + ("rust-http" ,rust-http-0.2) + ("rust-regex" ,rust-regex-1) + ("rust-serde" ,rust-serde-1) + ("rust-tracing" ,rust-tracing-0.1)))) + (home-page "https://github.com/actix/actix-web") + (synopsis "Resource path matching and router library") + (description + "This package provides resource path matching and router library.") + (license (list license:expat license:asl2.0)))) + (define-public rust-actix-router-0.2 (package + (inherit rust-actix-router-0.5) (name "rust-actix-router") (version "0.2.5") (source @@ -685,7 +770,6 @@ during testing.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "0df2626hk4n4yki6j88v3k0gcm8pi5hdnm1mldyvyi8nvbdzgldv")))) - (build-system cargo-build-system) (arguments ;; Tests fail with "error[E0432]: unresolved import `serde_derive`". `(#:tests? #false @@ -694,11 +778,7 @@ during testing.") ("rust-http" ,rust-http-0.2) ("rust-log" ,rust-log-0.4) ("rust-regex" ,rust-regex-1) - ("rust-serde" ,rust-serde-1)))) - (home-page "https://actix.rs") - (synopsis "Resource path matching library") - (description "This package provides resource path matching library.") - (license (list license:expat license:asl2.0)))) + ("rust-serde" ,rust-serde-1)))))) (define-public rust-actix-router-0.1 (package @@ -789,8 +869,40 @@ during testing.") ("rust-tokio-reactor" ,rust-tokio-reactor-0.1) ("rust-tokio-timer" ,rust-tokio-timer-0.2)))))) +(define-public rust-actix-server-2 + (package + (name "rust-actix-server") + (version "2.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "actix-server" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1m62qbg7vl1wddr6mm8sd4rnvd3w5v3zcn8fmdpfl8q4xxz3xc9y")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; unresolved import `actix_codec` + #:cargo-inputs (("rust-actix-rt" ,rust-actix-rt-2) + ("rust-actix-service" ,rust-actix-service-2) + ("rust-actix-utils" ,rust-actix-utils-3) + ("rust-futures-core" ,rust-futures-core-0.3) + ("rust-futures-util" ,rust-futures-util-0.3) + ("rust-mio" ,rust-mio-0.8) + ("rust-socket2" ,rust-socket2-0.5) + ("rust-tokio" ,rust-tokio-1) + ("rust-tokio-uring" ,rust-tokio-uring-0.4) + ("rust-tracing" ,rust-tracing-0.1)))) + (home-page "https://actix.rs") + (synopsis "General purpose TCP server built for the Actix ecosystem") + (description + "This package provides a general purpose TCP server built for the Actix +ecosystem.") + (license (list license:expat license:asl2.0)))) + (define-public rust-actix-server-1 (package + (inherit rust-actix-server-2) (name "rust-actix-server") (version "1.0.4") (source @@ -800,7 +912,6 @@ during testing.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "13khzd6pz9pqksxmw2syipfwq2gi5v9warx6pa24g8iccxp7wh25")))) - (build-system cargo-build-system) (arguments ;; Tests fail with "error[E0432]: unresolved import `bytes`" error. `(#:tests? #false @@ -816,13 +927,7 @@ during testing.") ("rust-mio-uds" ,rust-mio-uds-0.6) ("rust-num-cpus" ,rust-num-cpus-1) ("rust-slab" ,rust-slab-0.4) - ("rust-socket2" ,rust-socket2-0.3)))) - (home-page "https://actix.rs") - (synopsis "General purpose TCP server built for the Actix ecosystem") - (description - "This package provides a general purpose TCP server built for the Actix -ecosystem.") - (license (list license:expat license:asl2.0)))) + ("rust-socket2" ,rust-socket2-0.3)))))) (define-public rust-actix-server-0.6 (package @@ -932,8 +1037,33 @@ ecosystem.") (description "Actix server config utils.") (license (list license:expat license:asl2.0)))) +(define-public rust-actix-service-2 + (package + (name "rust-actix-service") + (version "2.0.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "actix-service" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0fipjcc5kma7j47jfrw55qm09dakgvx617jbriydrkqqz10lk29v")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; use of undeclared crate or module `actix_rt` + #:cargo-inputs (("rust-futures-core" ,rust-futures-core-0.3) + ("rust-paste" ,rust-paste-1) + ("rust-pin-project-lite" ,rust-pin-project-lite-0.2)))) + (home-page "https://github.com/actix/actix-net") + (synopsis "Service trait and combinators for asynchronous request/response") + (description + "This package provides a service trait and combinators for representing +asynchronous request/response operations.") + (license (list license:expat license:asl2.0)))) + (define-public rust-actix-service-1 (package + (inherit rust-actix-service-2) (name "rust-actix-service") (version "1.0.6") (source @@ -943,21 +1073,13 @@ ecosystem.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "1fw2b1cpxrpqk778mpvxv0cazj0pwjyb6khzs4syhnqvb1fl6lh0")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-futures-util" ,rust-futures-util-0.3) ("rust-pin-project" ,rust-pin-project-0.4)) #:cargo-development-inputs (("rust-actix-rt" ,rust-actix-rt-1) - ("rust-criterion" ,rust-criterion-0.3)))) - (home-page "https://actix.rs") - (synopsis - "Service trait and combinators for asynchronous request/response") - (description - "This package provides a service trait and combinators for representing -asynchronous request/response operations.") - (license (list license:expat license:asl2.0)))) + ("rust-criterion" ,rust-criterion-0.3)))))) (define-public rust-actix-service-0.4 (package @@ -1110,8 +1232,54 @@ asynchronous request/response operations.") ("rust-parking-lot" ,rust-parking-lot-0.9) ("rust-threadpool" ,rust-threadpool-1)))))) +(define-public rust-actix-tls-3 + (package + (name "rust-actix-tls") + (version "3.3.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "actix-tls" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0pxyqpr5nangbl55gdc5zpc84viah7qhmpjw5v3pnirb5w5fdk6l")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; use of undeclared crate or module `actix_server` + #:cargo-inputs (("rust-actix-rt" ,rust-actix-rt-2) + ("rust-actix-service" ,rust-actix-service-2) + ("rust-actix-utils" ,rust-actix-utils-3) + ("rust-futures-core" ,rust-futures-core-0.3) + ("rust-http" ,rust-http-0.2) + ("rust-http" ,rust-http-1) + ("rust-impl-more" ,rust-impl-more-0.1) + ("rust-openssl" ,rust-openssl-0.10) + ("rust-pin-project-lite" ,rust-pin-project-lite-0.2) + ("rust-rustls" ,rust-rustls-0.21) + ("rust-rustls-native-certs" ,rust-rustls-native-certs-0.7) + ("rust-rustls-native-certs" ,rust-rustls-native-certs-0.6) + ("rust-rustls-pki-types" ,rust-rustls-pki-types-1) + ("rust-rustls-webpki" ,rust-rustls-webpki-0.101) + ("rust-tokio" ,rust-tokio-1) + ("rust-tokio-native-tls" ,rust-tokio-native-tls-0.3) + ("rust-tokio-openssl" ,rust-tokio-openssl-0.6) + ("rust-tokio-rustls" ,rust-tokio-rustls-0.25) + ("rust-tokio-rustls" ,rust-tokio-rustls-0.23) + ("rust-tokio-rustls" ,rust-tokio-rustls-0.24) + ("rust-tokio-util" ,rust-tokio-util-0.7) + ("rust-tracing" ,rust-tracing-0.1) + ("rust-webpki-roots" ,rust-webpki-roots-0.25) + ("rust-webpki-roots" ,rust-webpki-roots-0.22) + ("rust-webpki-roots" ,rust-webpki-roots-0.26)))) + (home-page "https://github.com/actix/actix-net") + (synopsis "TLS acceptor services for Actix ecosystem") + (description + "This package provides TLS acceptor services for Actix ecosystem.") + (license (list license:expat license:asl2.0)))) + (define-public rust-actix-tls-2 (package + (inherit rust-actix-tls-3) (name "rust-actix-tls") (version "2.0.0") (source @@ -1121,7 +1289,6 @@ asynchronous request/response operations.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "1yqmlyn02c72a1rrmjkfx5hnz286130y3sq4ll1mbkv1fdyrny14")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs @@ -1136,12 +1303,7 @@ asynchronous request/response operations.") ("rust-tokio-rustls" ,rust-tokio-rustls-0.14) ("rust-tokio-tls" ,rust-tokio-tls-0.3) ("rust-webpki" ,rust-webpki-0.21) - ("rust-webpki-roots" ,rust-webpki-roots-0.20)))) - (home-page "https://actix.rs") - (synopsis "TLS acceptor services for Actix ecosystem") - (description - "This package provides TLS acceptor services for Actix ecosystem.") - (license (list license:expat license:asl2.0)))) + ("rust-webpki-roots" ,rust-webpki-roots-0.20)))))) (define-public rust-actix-tls-1 (package @@ -1176,8 +1338,32 @@ asynchronous request/response operations.") #:cargo-development-inputs (("rust-actix-testing" ,rust-actix-testing-1)))))) +(define-public rust-actix-utils-3 + (package + (name "rust-actix-utils") + (version "3.0.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "actix-utils" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1n05nzwdkx6jhmzr6f9qsh57a8hqlwv5rjz1i0j3qvj6y7gxr8c8")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; use of undeclared crate or module `futures_util` + #:cargo-inputs (("rust-local-waker" ,rust-local-waker-0.1) + ("rust-pin-project-lite" ,rust-pin-project-lite-0.2)))) + (home-page "https://github.com/actix/actix-net") + (synopsis "Network related services and utilities for the Actix ecosystem") + (description + "This package provides various network related services and utilities for +the Actix ecosystem.") + (license (list license:expat license:asl2.0)))) + (define-public rust-actix-utils-2 (package + (inherit rust-actix-utils-3) (name "rust-actix-utils") (version "2.0.0") (source @@ -1187,7 +1373,6 @@ asynchronous request/response operations.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "0nkby6wpwcmjr3zcghd962l2hyjry0aayncyjzbx2ck6qpg2541f")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-actix-codec" ,rust-actix-codec-0.3) @@ -1201,13 +1386,7 @@ asynchronous request/response operations.") ("rust-futures-util" ,rust-futures-util-0.3) ("rust-log" ,rust-log-0.4) ("rust-pin-project" ,rust-pin-project-0.4) - ("rust-slab" ,rust-slab-0.4)))) - (home-page "https://actix.rs") - (synopsis "Network related services and utilities for the Actix ecosystem") - (description - "This package provides various network related services and utilities for -the Actix ecosystem.") - (license (list license:expat license:asl2.0)))) + ("rust-slab" ,rust-slab-0.4)))))) (define-public rust-actix-utils-1 (package @@ -1260,8 +1439,64 @@ the Actix ecosystem.") #:cargo-development-inputs (("rust-actix-rt" ,rust-actix-rt-0.2)))))) +(define-public rust-actix-web-4 + (package + (name "rust-actix-web") + (version "4.5.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "actix-web" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1159grrp031zy9j97vr3c376w8pdawr8akbib0iqqqxvvrnmb9j3")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; could not find `brotli` in the list of imported crates + #:cargo-inputs (("rust-actix-codec" ,rust-actix-codec-0.5) + ("rust-actix-http" ,rust-actix-http-3) + ("rust-actix-macros" ,rust-actix-macros-0.2) + ("rust-actix-router" ,rust-actix-router-0.5) + ("rust-actix-rt" ,rust-actix-rt-2) + ("rust-actix-server" ,rust-actix-server-2) + ("rust-actix-service" ,rust-actix-service-2) + ("rust-actix-tls" ,rust-actix-tls-3) + ("rust-actix-utils" ,rust-actix-utils-3) + ("rust-actix-web-codegen" ,rust-actix-web-codegen-4) + ("rust-ahash" ,rust-ahash-0.8) + ("rust-bytes" ,rust-bytes-1) + ("rust-bytestring" ,rust-bytestring-1) + ("rust-cfg-if" ,rust-cfg-if-1) + ("rust-cookie" ,rust-cookie-0.16) + ("rust-derive-more" ,rust-derive-more-0.99) + ("rust-encoding-rs" ,rust-encoding-rs-0.8) + ("rust-futures-core" ,rust-futures-core-0.3) + ("rust-futures-util" ,rust-futures-util-0.3) + ("rust-itoa" ,rust-itoa-1) + ("rust-language-tags" ,rust-language-tags-0.3) + ("rust-log" ,rust-log-0.4) + ("rust-mime" ,rust-mime-0.3) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-pin-project-lite" ,rust-pin-project-lite-0.2) + ("rust-regex" ,rust-regex-1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-serde-urlencoded" ,rust-serde-urlencoded-0.7) + ("rust-smallvec" ,rust-smallvec-1) + ("rust-socket2" ,rust-socket2-0.5) + ("rust-time" ,rust-time-0.3) + ("rust-url" ,rust-url-2)))) + (native-inputs (list pkg-config)) + (inputs (list (list zstd "lib"))) + (home-page "https://actix.rs") + (synopsis "Powerful, pragmatic, and fast web framework for Rust") + (description + "Actix Web is a powerful, pragmatic, and fast web framework for Rust.") + (license (list license:expat license:asl2.0)))) + (define-public rust-actix-web-3 (package + (inherit rust-actix-web-4) (name "rust-actix-web") (version "3.3.2") (source @@ -1271,7 +1506,6 @@ the Actix ecosystem.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "11kv8y1p9dw78lnhrw3rqavhmazmy7s0z8j14a3a1yp7fahx8hg6")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs @@ -1307,13 +1541,7 @@ the Actix ecosystem.") ("rust-socket2" ,rust-socket2-0.3) ("rust-time" ,rust-time-0.2) ("rust-tinyvec" ,rust-tinyvec-1) - ("rust-url" ,rust-url-2)))) - (home-page "https://actix.rs") - (synopsis "Powerful, pragmatic, and fast web framework for Rust") - (description - "Actix Web is a powerful, pragmatic, and fast web framework for -Rust.") - (license (list license:expat license:asl2.0)))) + ("rust-url" ,rust-url-2)))))) (define-public rust-actix-web-2 (package @@ -1418,8 +1646,33 @@ Rust.") ("rust-serde-derive" ,rust-serde-derive-1) ("rust-tokio-timer" ,rust-tokio-timer-0.2)))))) +(define-public rust-actix-web-codegen-4 + (package + (name "rust-actix-web-codegen") + (version "4.2.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "actix-web-codegen" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1xalrv1s7imzfgxyql6zii5bpxxkk11rlcc8n4ia3v1hpgmm07zb")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; use of undeclared crate or module `rustversion` + #:cargo-inputs (("rust-actix-router" ,rust-actix-router-0.5) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-2)))) + (home-page "https://actix.rs") + (synopsis "Routing and runtime macros for Actix Web") + (description + "This package provides routing and runtime macros for Actix Web.") + (license (list license:expat license:asl2.0)))) + (define-public rust-actix-web-codegen-0.4 (package + (inherit rust-actix-web-codegen-4) (name "rust-actix-web-codegen") (version "0.4.0") (source @@ -1429,17 +1682,12 @@ Rust.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "1ys3f6q0hgflqvp271s49q88m41db3iynm7ydxy0wgikjdqgf9md")))) - (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://actix.rs") - (synopsis "Actix web proc macros") - (description "This package provides Actix web proc macros.") - (license (list license:expat license:asl2.0)))) + ("rust-syn" ,rust-syn-1)))))) (define-public rust-actix-web-codegen-0.2 (package @@ -1490,6 +1738,34 @@ Rust.") (inputs (list openssl)))) +(define-public rust-ammonia-4 + (package + (name "rust-ammonia") + (version "4.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "ammonia" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0nd432yg1cl9kj4i9c37a9hvwffayqh6zsvb4fmh31g5bsp9xf8s")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("html5ever" ,rust-html5ever-0.27) + ("maplit" ,rust-maplit-1) + ("tendril" ,rust-tendril-0.4) + ("url" ,rust-url-2) + ("once_cell" ,rust-once-cell-1)) + #:cargo-development-inputs (("version-sync" ,rust-version-sync-0.9) + ("env_logger" ,rust-env-logger-0.10)))) + (home-page "https://github.com/rust-ammonia/ammonia") + (synopsis "Repair and secure untrusted HTML") + (description "Ammonia is a whitelist-based HTML sanitization library. +It is designed to prevent cross-site scripting, layout breaking, +and clickjacking caused by untrusted user-provided HTML +being mixed into a larger web page.") + (license (list license:expat license:asl2.0)))) + (define-public rust-async-h1-2 (package (name "rust-async-h1") @@ -1633,8 +1909,77 @@ built on the Actix ecosystem.") ("rust-serde-urlencoded" ,rust-serde-urlencoded-0.6) ("rust-tokio-timer" ,rust-tokio-timer-0.2)))))) +(define-public rust-axum-0.7 + (package + (name "rust-axum") + (version "0.7.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "axum" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "17kv7v8m981cqmfbv5m538fzxhw51l9bajv06kfddi7njarb8dhj")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-async-trait" ,rust-async-trait-0.1) + ("rust-axum-core" ,rust-axum-core-0.4) + ("rust-axum-macros" ,rust-axum-macros-0.4) + ("rust-base64" ,rust-base64-0.21) + ("rust-bytes" ,rust-bytes-1) + ("rust-futures-util" ,rust-futures-util-0.3) + ("rust-http" ,rust-http-1) + ("rust-http-body" ,rust-http-body-1) + ("rust-http-body-util" ,rust-http-body-util-0.1) + ("rust-hyper" ,rust-hyper-1) + ("rust-hyper-util" ,rust-hyper-util-0.1) + ("rust-itoa" ,rust-itoa-1) + ("rust-matchit" ,rust-matchit-0.7) + ("rust-memchr" ,rust-memchr-2) + ("rust-mime" ,rust-mime-0.3) + ("rust-multer" ,rust-multer-3) + ("rust-percent-encoding" ,rust-percent-encoding-2) + ("rust-pin-project-lite" ,rust-pin-project-lite-0.2) + ("rust-rustversion" ,rust-rustversion-1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-serde-path-to-error" ,rust-serde-path-to-error-0.1) + ("rust-serde-urlencoded" ,rust-serde-urlencoded-0.7) + ("rust-sha1" ,rust-sha1-0.10) + ("rust-sync-wrapper" ,rust-sync-wrapper-0.1) + ("rust-tokio" ,rust-tokio-1) + ("rust-tokio-tungstenite" ,rust-tokio-tungstenite-0.21) + ("rust-tower" ,rust-tower-0.4) + ("rust-tower-http" ,rust-tower-http-0.5) + ("rust-tower-layer" ,rust-tower-layer-0.3) + ("rust-tower-service" ,rust-tower-service-0.3) + ("rust-tracing" ,rust-tracing-0.1)) + #:cargo-development-inputs + (("rust-anyhow" ,rust-anyhow-1) + ("rust-axum-macros" ,rust-axum-macros-0.4) + ("rust-quickcheck" ,rust-quickcheck-1) + ("rust-quickcheck-macros" ,rust-quickcheck-macros-1) + ("rust-reqwest" ,rust-reqwest-0.11) + ("rust-rustversion" ,rust-rustversion-1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-time" ,rust-time-0.3) + ("rust-tokio" ,rust-tokio-1) + ("rust-tokio-stream" ,rust-tokio-stream-0.1) + ("rust-tokio-tungstenite" ,rust-tokio-tungstenite-0.21) + ("rust-tower" ,rust-tower-0.4) + ("rust-tower-http" ,rust-tower-http-0.5) + ("rust-tracing" ,rust-tracing-0.1) + ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3) + ("rust-uuid" ,rust-uuid-1)))) + (home-page "https://github.com/tokio-rs/axum") + (synopsis "Web framework that focuses on ergonomics and modularity") + (description "Web framework that focuses on ergonomics and modularity.") + (license license:expat))) + (define-public rust-axum-0.6 (package + (inherit rust-axum-0.7) (name "rust-axum") (version "0.6.20") (source @@ -1644,7 +1989,6 @@ built on the Actix ecosystem.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "1gynqkg3dcy1zd7il69h8a3zax86v6qq5zpawqyn87mr6979x0iv")))) - (build-system cargo-build-system) (arguments `(#:cargo-test-flags '("--release" "--lib" "--bins" "--tests" "--" "--skip=routing::tests::logging_rejections") @@ -1696,14 +2040,51 @@ built on the Actix ecosystem.") ("rust-tower-http" ,rust-tower-http-0.4) ("rust-tracing" ,rust-tracing-0.1) ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3) - ("rust-uuid" ,rust-uuid-1)))) + ("rust-uuid" ,rust-uuid-1)))))) + +(define-public rust-axum-core-0.4 + (package + (name "rust-axum-core") + (version "0.4.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "axum-core" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1qx28wg4j6qdcdrisqwyaavlzc0zvbsrcwa99zf9456lfbyn6p51")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-test-flags + ;; The doc tests contain references to axum_extra. + '("--release" "--lib" "--bins" "--tests") + #:cargo-inputs (("rust-async-trait" ,rust-async-trait-0.1) + ("rust-bytes" ,rust-bytes-1) + ("rust-futures-util" ,rust-futures-util-0.3) + ("rust-http" ,rust-http-1) + ("rust-http-body" ,rust-http-body-1) + ("rust-http-body-util" ,rust-http-body-util-0.1) + ("rust-mime" ,rust-mime-0.3) + ("rust-pin-project-lite" ,rust-pin-project-lite-0.2) + ("rust-rustversion" ,rust-rustversion-1) + ("rust-sync-wrapper" ,rust-sync-wrapper-0.1) + ("rust-tower-http" ,rust-tower-http-0.5) + ("rust-tower-layer" ,rust-tower-layer-0.3) + ("rust-tower-service" ,rust-tower-service-0.3) + ("rust-tracing" ,rust-tracing-0.1)) + #:cargo-development-inputs (("rust-axum" ,rust-axum-0.7) + ("rust-futures-util" ,rust-futures-util-0.3) + ("rust-hyper" ,rust-hyper-1) + ("rust-tokio" ,rust-tokio-1) + ("rust-tower-http" ,rust-tower-http-0.5)))) (home-page "https://github.com/tokio-rs/axum") - (synopsis "Web framework that focuses on ergonomics and modularity") - (description "Web framework that focuses on ergonomics and modularity.") + (synopsis "Core types and traits for @code{axum}") + (description "Core types and traits for @code{axum}.") (license license:expat))) (define-public rust-axum-core-0.3 (package + (inherit rust-axum-core-0.4) (name "rust-axum-core") (version "0.3.4") (source @@ -1713,7 +2094,6 @@ built on the Actix ecosystem.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "0b1d9nkqb8znaba4qqzxzc968qwj4ybn4vgpyz9lz4a7l9vsb7vm")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-async-trait" ,rust-async-trait-0.1) ("rust-bytes" ,rust-bytes-1) @@ -1730,14 +2110,95 @@ built on the Actix ecosystem.") ("rust-futures-util" ,rust-futures-util-0.3) ("rust-hyper" ,rust-hyper-0.14) ("rust-tokio" ,rust-tokio-1) - ("rust-tower-http" ,rust-tower-http-0.4)))) + ("rust-tower-http" ,rust-tower-http-0.4)))))) + +(define-public rust-axum-macros-0.4 + (package + (name "rust-axum-macros") + (version "0.4.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "axum-macros" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1ahfy8z5z2xlibj41gyr2jm84di1x1s660g13jcfajh15pp5bh00")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; Tests unexpectedly pass. + #:cargo-inputs (("rust-heck" ,rust-heck-0.4) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-2)) + #:cargo-development-inputs (("rust-axum" ,rust-axum-0.7) + ("rust-axum-extra" ,rust-axum-extra-0.9) + ("rust-rustversion" ,rust-rustversion-1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-syn" ,rust-syn-2) + ("rust-tokio" ,rust-tokio-1) + ("rust-trybuild" ,rust-trybuild-1)))) + (home-page "https://github.com/tokio-rs/axum") + (synopsis "Macros for axum") + (description "This package provides macros for axum.") + (license license:expat))) + +(define-public rust-axum-extra-0.9 + (package + (name "rust-axum-extra") + (version "0.9.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "axum-extra" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "13yxdzc0jj9d2q4yqf13qs4psrx9l86vk3zn79vifrh1f8pz8pw9")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; Not all files included. + #:cargo-inputs (("rust-axum" ,rust-axum-0.7) + ("rust-axum-core" ,rust-axum-core-0.4) + ("rust-axum-macros" ,rust-axum-macros-0.4) + ("rust-bytes" ,rust-bytes-1) + ("rust-cookie" ,rust-cookie-0.18) + ("rust-form-urlencoded" ,rust-form-urlencoded-1) + ("rust-futures-util" ,rust-futures-util-0.3) + ("rust-headers" ,rust-headers-0.4) + ("rust-http" ,rust-http-1) + ("rust-http-body" ,rust-http-body-1) + ("rust-http-body-util" ,rust-http-body-util-0.1) + ("rust-mime" ,rust-mime-0.3) + ("rust-multer" ,rust-multer-3) + ("rust-percent-encoding" ,rust-percent-encoding-2) + ("rust-pin-project-lite" ,rust-pin-project-lite-0.2) + ("rust-prost" ,rust-prost-0.12) + ("rust-serde" ,rust-serde-1) + ("rust-serde-html-form" ,rust-serde-html-form-0.2) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-serde-path-to-error" ,rust-serde-path-to-error-0.1) + ("rust-tokio" ,rust-tokio-1) + ("rust-tokio-stream" ,rust-tokio-stream-0.1) + ("rust-tokio-util" ,rust-tokio-util-0.7) + ("rust-tower" ,rust-tower-0.4) + ("rust-tower-layer" ,rust-tower-layer-0.3) + ("rust-tower-service" ,rust-tower-service-0.3)) + #:cargo-development-inputs (("rust-axum" ,rust-axum-0.7) + ("rust-hyper" ,rust-hyper-1) + ("rust-reqwest" ,rust-reqwest-0.11) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-tokio" ,rust-tokio-1) + ("rust-tower" ,rust-tower-0.4) + ("rust-tower-http" ,rust-tower-http-0.5)))) (home-page "https://github.com/tokio-rs/axum") - (synopsis "Core types and traits for @code{axum}") - (description "Core types and traits for @code{axum}.") + (synopsis "Extra utilities for axum") + (description "Extra utilities for axum.") (license license:expat))) (define-public rust-axum-extra-0.7 (package + (inherit rust-axum-extra-0.9) (name "rust-axum-extra") (version "0.7.7") (source @@ -1747,7 +2208,6 @@ built on the Actix ecosystem.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "0gr8mdpi5xfq964zhaygap0qjvzwspvj8fdg41rp6b1qx4xl6gm9")))) - (build-system cargo-build-system) (arguments `(#:tests? #f ; Not all files included. #:cargo-inputs (("rust-axum" ,rust-axum-0.6) @@ -1782,11 +2242,7 @@ built on the Actix ecosystem.") ("rust-serde-json" ,rust-serde-json-1) ("rust-tokio" ,rust-tokio-1) ("rust-tower" ,rust-tower-0.4) - ("rust-tower-http" ,rust-tower-http-0.4)))) - (home-page "https://github.com/tokio-rs/axum") - (synopsis "Extra utilities for axum") - (description "Extra utilities for axum") - (license license:expat))) + ("rust-tower-http" ,rust-tower-http-0.4)))))) (define-public rust-axum-macros-0.3 (package @@ -1820,6 +2276,32 @@ built on the Actix ecosystem.") (description "Macros for @code{axum}.") (license license:expat))) +(define-public rust-chardetng-0.1 + (package + (name "rust-chardetng") + (version "0.1.17") + (source + (origin + (method url-fetch) + (uri (crate-uri "chardetng" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1spikjcnblwa5n1nnk46fxkwn86yfiqxgs47h4yaw23vbfvg1f0l")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; cannot find macro `println` in this scope + #:cargo-inputs (("rust-arrayvec" ,rust-arrayvec-0.5) + ("rust-cfg-if" ,rust-cfg-if-1) + ("rust-encoding-rs" ,rust-encoding-rs-0.8) + ("rust-memchr" ,rust-memchr-2) + ("rust-rayon" ,rust-rayon-1)) + #:cargo-development-inputs (("rust-detone" ,rust-detone-1)))) + (home-page "https://docs.rs/chardetng/") + (synopsis "Character encoding detector for legacy Web content") + (description + "This package provides a character encoding detector for legacy Web content.") + (license (list license:asl2.0 license:expat)))) + (define-public rust-chunked-transfer-1 (package (name "rust-chunked-transfer") @@ -1883,48 +2365,84 @@ transfer coding.") (description "This package provides a library to fetch gemini pages.") (license license:expat))) -(define-public rust-h2-0.3 +(define-public rust-h2-0.4 (package (name "rust-h2") - (version "0.3.21") + (version "0.4.4") (source (origin (method url-fetch) (uri (crate-uri "h2" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0cq8g5bgk3fihnqicy3g8gc3dpsalzqjg4bjyip9g4my26m27z4i")))) + (base32 "0sc0ymhiqp4hbz39d405cjbga77wnz2pprbgyc498xs58hlwfvl1")))) (build-system cargo-build-system) (arguments - `(#:tests? #f ; Not all files included. - #:cargo-inputs - (("rust-bytes" ,rust-bytes-1) - ("rust-fnv" ,rust-fnv-1) - ("rust-futures-core" ,rust-futures-core-0.3) - ("rust-futures-sink" ,rust-futures-sink-0.3) - ("rust-futures-util" ,rust-futures-util-0.3) - ("rust-http" ,rust-http-0.2) - ("rust-indexmap" ,rust-indexmap-1) - ("rust-slab" ,rust-slab-0.4) - ("rust-tokio" ,rust-tokio-1) - ("rust-tokio-util" ,rust-tokio-util-0.7) - ("rust-tracing" ,rust-tracing-0.1)) + `(#:tests? #f ; Not all files included + #:cargo-inputs (("rust-bytes" ,rust-bytes-1) + ("rust-fnv" ,rust-fnv-1) + ("rust-futures-core" ,rust-futures-core-0.3) + ("rust-futures-sink" ,rust-futures-sink-0.3) + ("rust-futures-util" ,rust-futures-util-0.3) + ("rust-http" ,rust-http-1) + ("rust-indexmap" ,rust-indexmap-2) + ("rust-slab" ,rust-slab-0.4) + ("rust-tokio" ,rust-tokio-1) + ("rust-tokio-util" ,rust-tokio-util-0.7) + ("rust-tracing" ,rust-tracing-0.1)) #:cargo-development-inputs - (("rust-env-logger" ,rust-env-logger-0.9) + (("rust-env-logger" ,rust-env-logger-0.10) ("rust-hex" ,rust-hex-0.4) ("rust-quickcheck" ,rust-quickcheck-1) ("rust-rand" ,rust-rand-0.8) ("rust-serde" ,rust-serde-1) ("rust-serde-json" ,rust-serde-json-1) ("rust-tokio" ,rust-tokio-1) - ("rust-tokio-rustls" ,rust-tokio-rustls-0.23) + ("rust-tokio-rustls" ,rust-tokio-rustls-0.24) ("rust-walkdir" ,rust-walkdir-2) - ("rust-webpki-roots" ,rust-webpki-roots-0.22)))) + ("rust-webpki-roots" ,rust-webpki-roots-0.25)))) (home-page "https://github.com/hyperium/h2") - (synopsis "HTTP/2.0 client and server") - (description "This package provides an HTTP/2.0 client and server.") + (synopsis "HTTP/2 client and server") + (description "This package provides an HTTP/2 client and server.") (license license:expat))) +(define-public rust-h2-0.3 + (package + (inherit rust-h2-0.4) + (name "rust-h2") + (version "0.3.25") + (source + (origin + (method url-fetch) + (uri (crate-uri "h2" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1sqq8rnv3vrwra7wzgc6099j9zw80rnm9aslhsa8d674qlh2igag")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; Not all files included. + #:cargo-inputs (("rust-bytes" ,rust-bytes-1) + ("rust-fnv" ,rust-fnv-1) + ("rust-futures-core" ,rust-futures-core-0.3) + ("rust-futures-sink" ,rust-futures-sink-0.3) + ("rust-futures-util" ,rust-futures-util-0.3) + ("rust-http" ,rust-http-0.2) + ("rust-indexmap" ,rust-indexmap-1) + ("rust-slab" ,rust-slab-0.4) + ("rust-tokio" ,rust-tokio-1) + ("rust-tokio-util" ,rust-tokio-util-0.7) + ("rust-tracing" ,rust-tracing-0.1)) + #:cargo-development-inputs (("rust-env-logger" ,rust-env-logger-0.10) + ("rust-hex" ,rust-hex-0.4) + ("rust-quickcheck" ,rust-quickcheck-1) + ("rust-rand" ,rust-rand-0.8) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-tokio" ,rust-tokio-1) + ("rust-tokio-rustls" ,rust-tokio-rustls-0.24) + ("rust-walkdir" ,rust-walkdir-2) + ("rust-webpki-roots" ,rust-webpki-roots-0.25)))))) + (define-public rust-h2-0.2 (package (inherit rust-h2-0.3) @@ -2006,25 +2524,25 @@ transfer coding.") ("rust-webpki" ,rust-webpki-0.21) ("rust-webpki-roots" ,rust-webpki-roots-0.17)))))) -(define-public rust-h3-0.0.3 +(define-public rust-h3-0.0.4 (package (name "rust-h3") - (version "0.0.3") + (version "0.0.4") (source (origin (method url-fetch) (uri (crate-uri "h3" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "101vg73galsyk5gnjb49cjb6q40c9z2npcdxpfsj99ky2waijgmq")))) + (base32 "04clhh6b5iqlgnbppikbz4zpxl78g4vkyhyrjgnyg4vfkrmqij5i")))) (build-system cargo-build-system) (arguments - `(#:tests? #f ; Not all files included + `(#:tests? #f ;not all files included #:cargo-inputs (("rust-bytes" ,rust-bytes-1) ("rust-fastrand" ,rust-fastrand-2) ("rust-futures-util" ,rust-futures-util-0.3) - ("rust-http" ,rust-http-0.2) + ("rust-http" ,rust-http-1) ("rust-pin-project-lite" ,rust-pin-project-lite-0.2) ("rust-tokio" ,rust-tokio-1) ("rust-tracing" ,rust-tracing-0.1)) @@ -2045,6 +2563,41 @@ transfer coding.") (description "This package provides an async HTTP/3 implementation.") (license license:expat))) +(define-public rust-h3-0.0.3 + (package + (inherit rust-h3-0.0.4) + (name "rust-h3") + (version "0.0.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "h3" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "101vg73galsyk5gnjb49cjb6q40c9z2npcdxpfsj99ky2waijgmq")))) + (arguments + `(#:tests? #f ; Not all files included + #:cargo-inputs + (("rust-bytes" ,rust-bytes-1) + ("rust-fastrand" ,rust-fastrand-2) + ("rust-futures-util" ,rust-futures-util-0.3) + ("rust-http" ,rust-http-0.2) + ("rust-pin-project-lite" ,rust-pin-project-lite-0.2) + ("rust-tokio" ,rust-tokio-1) + ("rust-tracing" ,rust-tracing-0.1)) + #:cargo-development-inputs + (("rust-assert-matches" ,rust-assert-matches-1) + ("rust-futures" ,rust-futures-0.3) + ("rust-futures-util" ,rust-futures-util-0.3) + ("rust-proptest" ,rust-proptest-1) + ("rust-quinn" ,rust-quinn-0.10) + ("rust-quinn-proto" ,rust-quinn-proto-0.10) + ("rust-rcgen" ,rust-rcgen-0.11) + ("rust-rustls" ,rust-rustls-0.21) + ("rust-tokio" ,rust-tokio-1) + ("rust-tokio-util" ,rust-tokio-util-0.7) + ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3)))))) + (define-public rust-h3-0.0.2 (package (inherit rust-h3-0.0.3) @@ -2066,8 +2619,36 @@ transfer coding.") ("rust-tokio" ,rust-tokio-1) ("rust-tracing" ,rust-tracing-0.1)))))) +(define-public rust-h3-quinn-0.0.5 + (package + (name "rust-h3-quinn") + (version "0.0.5") + (source + (origin + (method url-fetch) + (uri (crate-uri "h3-quinn" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0ii06bi5a19k4qfkppn5019nw8xca2wzfl66cax949jc1v66ny3k")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-bytes" ,rust-bytes-1) + ("rust-futures" ,rust-futures-0.3) + ("rust-h3" ,rust-h3-0.0.4) + ("rust-quinn" ,rust-quinn-0.10) + ("rust-quinn-proto" ,rust-quinn-proto-0.10) + ("rust-tokio" ,rust-tokio-1) + ("rust-tokio-util" ,rust-tokio-util-0.7)))) + (home-page "https://github.com/hyperium/h3") + (synopsis "QUIC transport implementation based on Quinn") + (description + "This package provides QUIC transport implementation based on Quinn.") + (license license:expat))) + (define-public rust-h3-quinn-0.0.4 (package + (inherit rust-h3-quinn-0.0.5) (name "rust-h3-quinn") (version "0.0.4") (source @@ -2077,7 +2658,6 @@ transfer coding.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "1r0sm0j51crlfpy2j1wfhgpg2lrfq2xmf5qjd98ksg3h9l0pb5mc")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-bytes" ,rust-bytes-1) ("rust-futures" ,rust-futures-0.3) @@ -2085,12 +2665,7 @@ transfer coding.") ("rust-quinn" ,rust-quinn-0.10) ("rust-quinn-proto" ,rust-quinn-proto-0.10) ("rust-tokio" ,rust-tokio-1) - ("rust-tokio-util" ,rust-tokio-util-0.7)))) - (home-page "https://github.com/hyperium/h3") - (synopsis "QUIC transport implementation based on Quinn") - (description - "This package provides QUIC transport implementation based on Quinn.") - (license license:expat))) + ("rust-tokio-util" ,rust-tokio-util-0.7)))))) (define-public rust-h3-quinn-0.0.3 (package @@ -2112,8 +2687,34 @@ transfer coding.") ("rust-quinn-proto" ,rust-quinn-proto-0.10) ("rust-tokio-util" ,rust-tokio-util-0.7)))))) +(define-public rust-headers-0.4 + (package + (name "rust-headers") + (version "0.4.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "headers" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1abari69kjl2yv2dg06g2x17qgd1a20xp7aqmmg2vfhcppk0c89j")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-base64" ,rust-base64-0.21) + ("rust-bytes" ,rust-bytes-1) + ("rust-headers-core" ,rust-headers-core-0.3) + ("rust-http" ,rust-http-1) + ("rust-httpdate" ,rust-httpdate-1) + ("rust-mime" ,rust-mime-0.3) + ("rust-sha1" ,rust-sha1-0.10)))) + (home-page "https://hyper.rs") + (synopsis "Typed HTTP headers") + (description "This package provides typed HTTP headers.") + (license license:expat))) + (define-public rust-headers-0.3 (package + (inherit rust-headers-0.4) (name "rust-headers") (version "0.3.9") (source @@ -2123,7 +2724,6 @@ transfer coding.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "0w62gnwh2p1lml0zqdkrx9dp438881nhz32zrzdy61qa0a9kns06")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-base64" ,rust-base64-0.21) @@ -2132,11 +2732,7 @@ transfer coding.") ("rust-http" ,rust-http-0.2) ("rust-httpdate" ,rust-httpdate-1) ("rust-mime" ,rust-mime-0.3) - ("rust-sha1" ,rust-sha1-0.10)))) - (home-page "https://hyper.rs") - (synopsis "Typed HTTP headers") - (description "This package provides typed HTTP headers.") - (license license:expat))) + ("rust-sha1" ,rust-sha1-0.10)))))) (define-public rust-headers-0.2 (package @@ -2161,27 +2757,41 @@ transfer coding.") ("rust-sha-1" ,rust-sha-1-0.8) ("rust-time" ,rust-time-0.1)))))) -(define-public rust-headers-core-0.2 +(define-public rust-headers-core-0.3 (package (name "rust-headers-core") - (version "0.2.0") + (version "0.3.0") (source (origin (method url-fetch) (uri (crate-uri "headers-core" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0ab469xfpd411mc3dhmjhmzrhqikzyj8a17jn5bkj9zfpy0n9xp7")))) + (base32 "1r1w80i2bhmyh8s5mjr2dz6baqlrm6cak6yvzm4jq96lacjs5d2l")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-http" ,rust-http-0.2)))) + `(#:cargo-inputs (("rust-http" ,rust-http-1)))) (home-page "https://hyper.rs") (synopsis "Typed HTTP headers core trait") (description "This package provides typed HTTP headers core trait.") (license license:expat))) +(define-public rust-headers-core-0.2 + (package + (inherit rust-headers-core-0.3) + (name "rust-headers-core") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "headers-core" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0ab469xfpd411mc3dhmjhmzrhqikzyj8a17jn5bkj9zfpy0n9xp7")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs (("rust-http" ,rust-http-0.2)))))) + (define-public rust-headers-core-0.1 (package (inherit rust-headers-core-0.2) @@ -2584,19 +3194,20 @@ requests and responses.") (define-public rust-http-auth-0.1 (package (name "rust-http-auth") - (version "0.1.8") + (version "0.1.9") (source (origin (method url-fetch) (uri (crate-uri "http-auth" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1g6gpn2py0c4l45wp61k3zc45vg5l20zq39mxgxh56hzgb6wlc2l")))) + (base32 "0mf27f963mxpbyjw20sjmm0ziqvr9z9m7kdlsrbada2fdazrng34")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-base64" ,rust-base64-0.21) ("rust-digest" ,rust-digest-0.10) ("rust-hex" ,rust-hex-0.4) + ("rust-http" ,rust-http-1) ("rust-http" ,rust-http-0.2) ("rust-log" ,rust-log-0.4) ("rust-md-5" ,rust-md-5-0.10) @@ -2617,30 +3228,46 @@ challenge lists, respond to Basic and Digest challenges. It is likely to be extended with server support and additional auth schemes.") (license (list license:expat license:asl2.0)))) -(define-public rust-http-body-0.4 +(define-public rust-http-body-1 (package (name "rust-http-body") - (version "0.4.6") + (version "1.0.0") (source (origin (method url-fetch) (uri (crate-uri "http-body" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1lmyjfk6bqk6k9gkn1dxq770sb78pqbqshga241hr5p995bb5skw")))) + (base32 "0hyn8n3iadrbwq8y0p1rl1275s4nm49bllw5wji29g4aa3dqbb0w")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-bytes" ,rust-bytes-1) - ("rust-http" ,rust-http-0.2)))) + `(#:cargo-inputs (("rust-bytes" ,rust-bytes-1) + ("rust-http" ,rust-http-1)))) (home-page "https://github.com/hyperium/http-body") (synopsis "Asynchronous, streaming, HTTP request or response body") (description - "This crate provides a trait representing an asynchronous, streaming, + "This package provides a trait representing an asynchronous, streaming, HTTP request or response body.") (license license:expat))) +(define-public rust-http-body-0.4 + (package + (inherit rust-http-body-1) + (name "rust-http-body") + (version "0.4.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "http-body" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1lmyjfk6bqk6k9gkn1dxq770sb78pqbqshga241hr5p995bb5skw")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bytes" ,rust-bytes-1) + ("rust-http" ,rust-http-0.2)))))) + (define-public rust-http-body-0.3 (package (inherit rust-http-body-0.4) @@ -2678,17 +3305,44 @@ HTTP request or response body.") ("rust-http" ,rust-http-0.1) ("rust-tokio-buf" ,rust-tokio-buf-0.1)))))) +(define-public rust-http-body-util-0.1 + (package + (name "rust-http-body-util") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "http-body-util" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0h78a6jj2vky0wmgmq5f1h541cmhmlij09gw63fxl59h77mpkjs1")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-bytes" ,rust-bytes-1) + ("rust-futures-util" ,rust-futures-util-0.3) + ("rust-http" ,rust-http-1) + ("rust-http-body" ,rust-http-body-1) + ("rust-pin-project-lite" ,rust-pin-project-lite-0.2)) + #:cargo-development-inputs (("rust-futures-util" ,rust-futures-util-0.3) + ("rust-tokio" ,rust-tokio-1)))) + (home-page "https://github.com/hyperium/http-body") + (synopsis "Combinators and adapters for HTTP request/response bodies") + (description + "This package provides combinators and adapters for HTTP request or +response bodies.") + (license license:expat))) + (define-public rust-http-client-6 (package (name "rust-http-client") - (version "6.3.4") + (version "6.5.3") (source (origin (method url-fetch) (uri (crate-uri "http-client" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1i0mys38gsih9kkrdbfsmd8p9lnb2nd5wch76cpkjmqk8mm2mhcq")))) + (base32 "19g19jli98cd0ywrzcsbw5j34rypm8n43yszxa3gaaqyr46m2iqr")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t @@ -2699,7 +3353,7 @@ HTTP request or response body.") ("rust-async-tls" ,rust-async-tls-0.10) ("rust-async-trait" ,rust-async-trait-0.1) ("rust-cfg-if" ,rust-cfg-if-1) - ("rust-dashmap" ,rust-dashmap-4) + ("rust-dashmap" ,rust-dashmap-5) ("rust-deadpool" ,rust-deadpool-0.7) ("rust-futures" ,rust-futures-0.3) ("rust-futures-util" ,rust-futures-util-0.3) @@ -2709,6 +3363,8 @@ HTTP request or response body.") ("rust-isahc" ,rust-isahc-0.9) ("rust-js-sys" ,rust-js-sys-0.3) ("rust-log" ,rust-log-0.4) + ("rust-rustls" ,rust-rustls-0.18) + ("rust-tokio" ,rust-tokio-0.2) ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2) ("rust-wasm-bindgen-futures" ,rust-wasm-bindgen-futures-0.4) ("rust-web-sys" ,rust-web-sys-0.3)))) @@ -2717,17 +3373,17 @@ HTTP request or response body.") (description "This package provides types and traits for HTTP clients.") (license (list license:expat license:asl2.0)))) -(define-public rust-http-range-header-0.3 +(define-public rust-http-range-header-0.4 (package (name "rust-http-range-header") - (version "0.3.1") + (version "0.4.0") (source (origin (method url-fetch) (uri (crate-uri "http-range-header" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "13vm511vq3bhschkw2xi9nhxzkw53m55gn9vxg7qigfxc29spl5d")))) + (base32 "1zhigmvyrk50jzll6nmn7n1rxkfzh8xn0838dvdvnj52rlqyzr1w")))) (build-system cargo-build-system) (arguments `(#:cargo-development-inputs @@ -2736,25 +3392,38 @@ HTTP request or response body.") ("rust-quickcheck-macros" ,rust-quickcheck-macros-1) ("rust-regex" ,rust-regex-1)))) (home-page "https://github.com/MarcusGrass/parse-range-headers") - (synopsis "No-dep range header parser") - (description "This crate provides a no-dep range header parser.") + (synopsis "Zero-dependency range header parser") + (description "This package provides a range header parser without any +dependencies.") (license license:expat))) +(define-public rust-http-range-header-0.3 + (package + (inherit rust-http-range-header-0.4) + (name "rust-http-range-header") + (version "0.3.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "http-range-header" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "13vm511vq3bhschkw2xi9nhxzkw53m55gn9vxg7qigfxc29spl5d")))))) + (define-public rust-http-types-2 (package (name "rust-http-types") - (version "2.10.0") + (version "2.12.0") (source (origin (method url-fetch) (uri (crate-uri "http-types" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0p7g2rzgzvnd419a5ddlyb2nz85z9bw7cdkqyl7467cx2fxkwq9j")))) + (base32 "1bgmfmvirsa1alcyw15mkh227j3a62aq1x47lkxxnfnnf9x1i6vf")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-anyhow" ,rust-anyhow-1) ("rust-async-channel" ,rust-async-channel-1) ("rust-async-std" ,rust-async-std-1) @@ -2767,9 +3436,11 @@ HTTP request or response body.") ("rust-rand" ,rust-rand-0.7) ("rust-serde" ,rust-serde-1) ("rust-serde-json" ,rust-serde-json-1) - ("rust-serde-qs" ,rust-serde-qs-0.7) + ("rust-serde-qs" ,rust-serde-qs-0.8) ("rust-serde-urlencoded" ,rust-serde-urlencoded-0.7) - ("rust-url" ,rust-url-2)))) + ("rust-url" ,rust-url-2)) + #:cargo-development-inputs (("rust-async-std" ,rust-async-std-1) + ("rust-http" ,rust-http-0.2)))) (home-page "https://github.com/http-rs/http-types") (synopsis "Common types for HTTP operations") (description @@ -2818,8 +3489,55 @@ HTTP request or response body.") "This crates parses and formats HTTP datetime strings.") (license (list license:expat license:asl2.0)))) +(define-public rust-hyper-1 + (package + (name "rust-hyper") + (version "1.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "hyper" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0fi6k7hz5fmdph0a5r8hw50d7h2n9zxkizmafcmb65f67bblhr8q")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; unresolved imports `super::DecodedLength`, `super::Sender` + #:cargo-inputs (("rust-bytes" ,rust-bytes-1) + ("rust-futures-channel" ,rust-futures-channel-0.3) + ("rust-futures-util" ,rust-futures-util-0.3) + ("rust-h2" ,rust-h2-0.4) + ("rust-http" ,rust-http-1) + ("rust-http-body" ,rust-http-body-1) + ("rust-http-body-util" ,rust-http-body-util-0.1) + ("rust-httparse" ,rust-httparse-1) + ("rust-httpdate" ,rust-httpdate-1) + ("rust-itoa" ,rust-itoa-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-pin-project-lite" ,rust-pin-project-lite-0.2) + ("rust-tokio" ,rust-tokio-1) + ("rust-tracing" ,rust-tracing-0.1) + ("rust-want" ,rust-want-0.3)) + #:cargo-development-inputs + (("rust-form-urlencoded" ,rust-form-urlencoded-1) + ("rust-futures-channel" ,rust-futures-channel-0.3) + ("rust-futures-util" ,rust-futures-util-0.3) + ("rust-http-body-util" ,rust-http-body-util-0.1) + ("rust-pretty-env-logger" ,rust-pretty-env-logger-0.5) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-spmc" ,rust-spmc-0.3) + ("rust-tokio" ,rust-tokio-1) + ("rust-tokio-test" ,rust-tokio-test-0.4) + ("rust-tokio-util" ,rust-tokio-util-0.7)))) + (home-page "https://hyper.rs") + (synopsis "Fast and correct HTTP library") + (description "This package provides a fast and correct HTTP library.") + (license license:expat))) + (define-public rust-hyper-0.14 (package + (inherit rust-hyper-1) (name "rust-hyper") (version "0.14.27") (source @@ -2862,11 +3580,7 @@ HTTP request or response body.") ("rust-tokio-test" ,rust-tokio-test-0.4) ("rust-tokio-util" ,rust-tokio-util-0.7) ("rust-tower" ,rust-tower-0.4) - ("rust-url" ,rust-url-2)))) - (home-page "https://hyper.rs") - (synopsis "Fast and correct HTTP library") - (description "This package provides a fast and correct HTTP library.") - (license license:expat))) + ("rust-url" ,rust-url-2)))))) (define-public rust-hyper-0.13 (package @@ -3056,8 +3770,48 @@ HTTP request or response body.") (description "Proxy connector for the Hyper HTTP library.") (license license:expat))) +(define-public rust-hyper-rustls-0.26 + (package + (name "rust-hyper-rustls") + (version "0.26.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "hyper-rustls" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0b4m1jvs147hxi8677n2dxxib663s7c31xmfni7b5qkanihsggm0")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ;not all files included + #:cargo-inputs + (("rust-futures-util" ,rust-futures-util-0.3) + ("rust-http" ,rust-http-1) + ("rust-hyper" ,rust-hyper-1) + ("rust-hyper-util" ,rust-hyper-util-0.1) + ("rust-log" ,rust-log-0.4) + ("rust-rustls" ,rust-rustls-0.22) + ("rust-rustls-native-certs" ,rust-rustls-native-certs-0.7) + ("rust-rustls-pki-types" ,rust-rustls-pki-types-1) + ("rust-tokio" ,rust-tokio-1) + ("rust-tokio-rustls" ,rust-tokio-rustls-0.25) + ("rust-tower-service" ,rust-tower-service-0.3) + ("rust-webpki-roots" ,rust-webpki-roots-0.26)) + #:cargo-development-inputs + (("rust-http-body-util" ,rust-http-body-util-0.1) + ("rust-hyper-util" ,rust-hyper-util-0.1) + ("rust-rustls" ,rust-rustls-0.22) + ("rust-rustls-pemfile" ,rust-rustls-pemfile-2) + ("rust-tokio" ,rust-tokio-1)))) + (home-page "https://github.com/rustls/hyper-rustls") + (synopsis "Rustls+Hyper integration for pure Rust HTTPS") + (description + "This package provides Rustls+Hyper integration for pure Rust HTTPS.") + (license (list license:asl2.0 license:isc license:expat)))) + (define-public rust-hyper-rustls-0.24 (package + (inherit rust-hyper-rustls-0.26) (name "rust-hyper-rustls") (version "0.24.2") (source @@ -3067,9 +3821,8 @@ HTTP request or response body.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "1475j4a2nczz4aajzzsq3hpwg1zacmzbqg393a14j80ff8izsgpc")))) - (build-system cargo-build-system) (arguments - `(#:tests? #f ; Not all files included. + `(#:tests? #f ; Not all files included. #:cargo-inputs (("rust-futures-util" ,rust-futures-util-0.3) ("rust-http" ,rust-http-0.2) ("rust-hyper" ,rust-hyper-0.14) @@ -3082,12 +3835,7 @@ HTTP request or response body.") #:cargo-development-inputs (("rust-hyper" ,rust-hyper-0.14) ("rust-rustls" ,rust-rustls-0.21) ("rust-rustls-pemfile" ,rust-rustls-pemfile-1) - ("rust-tokio" ,rust-tokio-1)))) - (home-page "https://github.com/rustls/hyper-rustls") - (synopsis "Rustls+Hyper integration for pure Rust HTTPS") - (description - "This package provides Rustls+Hyper integration for pure Rust HTTPS.") - (license (list license:asl2.0 license:isc license:expat)))) + ("rust-tokio" ,rust-tokio-1)))))) (define-public rust-hyper-rustls-0.23 (package @@ -3231,32 +3979,60 @@ HTTP request or response body.") to be used with Hyper client.") (license (list license:expat license:asl2.0)))) -(define-public rust-hyper-tls-0.5 +(define-public rust-hyper-tls-0.6 (package (name "rust-hyper-tls") - (version "0.5.0") + (version "0.6.0") (source (origin (method url-fetch) (uri (crate-uri "hyper-tls" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "01crgy13102iagakf6q4mb75dprzr7ps1gj0l5hxm1cvm7gks66n")))) + (base32 "1q36x2yps6hhvxq5r7mc8ph9zz6xlb573gx0x3yskb0fi736y83h")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs + `(#:cargo-inputs (("rust-bytes" ,rust-bytes-1) - ("rust-hyper" ,rust-hyper-0.14) + ("rust-http-body-util" ,rust-http-body-util-0.1) + ("rust-hyper" ,rust-hyper-1) + ("rust-hyper-util" ,rust-hyper-util-0.1) ("rust-native-tls" ,rust-native-tls-0.2) ("rust-tokio" ,rust-tokio-1) - ("rust-tokio-native-tls" ,rust-tokio-native-tls-0.3)))) + ("rust-tokio-native-tls" ,rust-tokio-native-tls-0.3) + ("rust-tower-service" ,rust-tower-service-0.3)) + #:cargo-development-inputs + (("rust-hyper-util" ,rust-hyper-util-0.1) + ("rust-tokio" ,rust-tokio-1)))) + (native-inputs (list pkg-config)) + (inputs (list openssl)) (home-page "https://hyper.rs") (synopsis "Default TLS implementation for use with hyper") (description "This package provides the default TLS implementation for use with hyper.") (license (list license:expat license:asl2.0)))) +(define-public rust-hyper-tls-0.5 + (package + (inherit rust-hyper-tls-0.6) + (name "rust-hyper-tls") + (version "0.5.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "hyper-tls" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "01crgy13102iagakf6q4mb75dprzr7ps1gj0l5hxm1cvm7gks66n")))) + (arguments + `(#:skip-build? #t + #:cargo-inputs + (("rust-bytes" ,rust-bytes-1) + ("rust-hyper" ,rust-hyper-0.14) + ("rust-native-tls" ,rust-native-tls-0.2) + ("rust-tokio" ,rust-tokio-1) + ("rust-tokio-native-tls" ,rust-tokio-native-tls-0.3)))))) + (define-public rust-hyper-tls-0.4 (package (inherit rust-hyper-tls-0.5) @@ -3284,6 +4060,45 @@ with hyper.") #:cargo-development-inputs (("rust-tokio" ,rust-tokio-0.2)))))) +(define-public rust-hyper-util-0.1 + (package + (name "rust-hyper-util") + (version "0.1.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "hyper-util" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1akngan7j0n2n0wd25c6952mvqbkj9gp1lcwzyxjc0d37l8yyf6a")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; could not find `client` in `hyper_util` + #:cargo-inputs (("rust-bytes" ,rust-bytes-1) + ("rust-futures-channel" ,rust-futures-channel-0.3) + ("rust-futures-util" ,rust-futures-util-0.3) + ("rust-http" ,rust-http-1) + ("rust-http-body" ,rust-http-body-1) + ("rust-hyper" ,rust-hyper-1) + ("rust-pin-project-lite" ,rust-pin-project-lite-0.2) + ("rust-socket2" ,rust-socket2-0.5) + ("rust-tokio" ,rust-tokio-1) + ("rust-tower" ,rust-tower-0.4) + ("rust-tower-service" ,rust-tower-service-0.3) + ("rust-tracing" ,rust-tracing-0.1)) + #:cargo-development-inputs + (("rust-bytes" ,rust-bytes-1) + ("rust-http-body-util" ,rust-http-body-util-0.1) + ("rust-hyper" ,rust-hyper-1) + ("rust-pnet-datalink" ,rust-pnet-datalink-0.34) + ("rust-pretty-env-logger" ,rust-pretty-env-logger-0.5) + ("rust-tokio" ,rust-tokio-1) + ("rust-tokio-test" ,rust-tokio-test-0.4)))) + (home-page "https://hyper.rs") + (synopsis "@code{hyper} utilities") + (description "This package provides utilities for the @code{hyper} crate.") + (license license:expat))) + (define-public rust-iron-0.6 (package (name "rust-iron") @@ -3318,8 +4133,72 @@ bottlenecks encountered in highly concurrent code by avoiding shared writes and locking in the core framework.") (license license:expat))) +(define-public rust-isahc-1 + (package + (name "rust-isahc") + (version "1.7.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "isahc" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1scfgyv3dpjbkqa9im25cd12cs6rbd8ygcaw67f3dx41sys08kik")) + (modules '((guix build utils))) + (snippet '(substitute* "Cargo.toml" + ((".*static-curl.*") ""))))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; unresolved import `testserver` + #:cargo-inputs (("rust-async-channel" ,rust-async-channel-1) + ("rust-castaway" ,rust-castaway-0.1) + ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.7) + ("rust-curl" ,rust-curl-0.4) + ("rust-curl-sys" ,rust-curl-sys-0.4) + ("rust-encoding-rs" ,rust-encoding-rs-0.8) + ("rust-event-listener" ,rust-event-listener-2) + ("rust-futures-lite" ,rust-futures-lite-1) + ("rust-http" ,rust-http-0.2) + ("rust-httpdate" ,rust-httpdate-1) + ("rust-log" ,rust-log-0.4) + ("rust-mime" ,rust-mime-0.3) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-parking-lot" ,rust-parking-lot-0.9) + ("rust-polling" ,rust-polling-2) + ("rust-publicsuffix" ,rust-publicsuffix-2) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-slab" ,rust-slab-0.4) + ("rust-sluice" ,rust-sluice-0.5) + ("rust-tracing" ,rust-tracing-0.1) + ("rust-tracing-futures" ,rust-tracing-futures-0.2) + ("rust-url" ,rust-url-2) + ("rust-waker-fn" ,rust-waker-fn-1)) + #:cargo-development-inputs + (("rust-env-logger" ,rust-env-logger-0.9) + ("rust-flate2" ,rust-flate2-1) + ("rust-indicatif" ,rust-indicatif-0.15) + ("rust-rayon" ,rust-rayon-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-static-assertions" ,rust-static-assertions-1) + ("rust-structopt" ,rust-structopt-0.3) + ("rust-tempfile" ,rust-tempfile-3) + ("rust-test-case" ,rust-test-case-2) + ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.2)))) + (native-inputs (list pkg-config)) + (inputs (list curl openssl zlib)) + (home-page "https://github.com/sagebind/isahc") + (synopsis "Practical and fun HTTP client") + (description + "Isahc is an acronym that stands for Incredible Streaming Asynchronous +HTTP Client. It is an asynchronous HTTP client for the Rust language. It +uses libcurl as an HTTP engine inside, and provides an easy-to-use API on top +that integrates with Rust idioms.") + (license license:expat))) + (define-public rust-isahc-0.9 (package + (inherit rust-isahc-1) (name "rust-isahc") (version "0.9.14") (source @@ -3329,11 +4208,9 @@ and locking in the core framework.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "12iqz5fj0509pr813pds2fgdk649a0b6ipvy3pqjwb1ywh68m572")) - (snippet - #~(begin (use-modules (guix build utils)) - (substitute* "Cargo.toml" - (("\"static-curl\", ") "")))))) - (build-system cargo-build-system) + (modules '((guix build utils))) + (snippet '(substitute* "Cargo.toml" + (("\"static-curl\", ") ""))))) (arguments `(#:tests? #f ; use of undeclared crate or module `testserver` #:cargo-inputs @@ -3364,18 +4241,98 @@ and locking in the core framework.") ("rust-indicatif" ,rust-indicatif-0.15) ("rust-structopt" ,rust-structopt-0.3) ("rust-test-case" ,rust-test-case-1) - ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.2)))) - (native-inputs - (list pkg-config)) - (inputs - (list curl openssl zlib)) - (home-page "https://github.com/sagebind/isahc") - (synopsis "Practical HTTP client") + ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.2)))))) + +(define-public rust-json5-0.4 + (package + (name "rust-json5") + (version "0.4.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "json5" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1h9hni897zmn3vcixfbwwkj2gkz27h7z9dah8bk1qv37mwhxpc4n")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-pest" ,rust-pest-2) + ("rust-pest-derive" ,rust-pest-derive-2) + ("rust-serde" ,rust-serde-1)) + #:cargo-development-inputs (("rust-matches" ,rust-matches-0.1) + ("rust-serde-derive" ,rust-serde-derive-1) + ("rust-serde-json" ,rust-serde-json-1)))) + (home-page "https://github.com/callum-oakley/json5-rs") + (synopsis "Rust JSON5 serializer and deserializer which speaks Serde") (description - "Isahc is an acronym that stands for Incredible Streaming Asynchronous -HTTP Client. It is an asynchronous HTTP client for the Rust language. It -uses libcurl as an HTTP engine inside, and provides an easy-to-use API on top -that integrates with Rust idioms.") + "This package provides a Rust JSON5 serializer and deserializer +which speaks Serde.") + (license license:isc))) + +(define-public rust-jsonwebtoken-7 + (package + (name "rust-jsonwebtoken") + (version "7.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "jsonwebtoken" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0ciz205wcjcn7n6i871zz5xlbzk863b0ybgiqi7li9ipwhawraxg")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-base64" ,rust-base64-0.12) + ("rust-pem" ,rust-pem-0.8) + ("rust-ring" ,rust-ring-0.16) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-simple-asn1" ,rust-simple-asn1-0.4)) + #:cargo-development-inputs (("rust-chrono" ,rust-chrono-0.4)))) + (home-page "https://github.com/Keats/jsonwebtoken") + (synopsis "Create and decode JWTs in a strongly typed way") + (description "Create and decode JWTs in a strongly typed way.") + (license license:expat))) + +(define-public rust-mockito-1 + (package + (name "rust-mockito") + (version "1.4.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "mockito" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "07mz6yyfnl1ka29wkl1qa6mvm66lwsjf8y3cl0m3kpsvm8iy1xnj")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-test-flags + '("--release" "--" + "--skip=test_assert_with_last_unmatched_request" + "--skip=test_assert_with_last_unmatched_request_and_headers" + "--skip=test_assert_with_last_unmatched_request_and_query") + #:cargo-inputs (("rust-assert-json-diff" ,rust-assert-json-diff-2) + ("rust-colored" ,rust-colored-2) + ("rust-futures-core" ,rust-futures-core-0.3) + ("rust-hyper" ,rust-hyper-0.14) + ("rust-log" ,rust-log-0.4) + ("rust-rand" ,rust-rand-0.8) + ("rust-regex" ,rust-regex-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-serde-urlencoded" ,rust-serde-urlencoded-0.7) + ("rust-similar" ,rust-similar-2) + ("rust-tokio" ,rust-tokio-1)) + #:cargo-development-inputs (("rust-env-logger" ,rust-env-logger-0.8) + ("rust-futures" ,rust-futures-0.3) + ("rust-reqwest" ,rust-reqwest-0.11) + ("rust-testing-logger" ,rust-testing-logger-0.1) + ("rust-tokio" ,rust-tokio-1)))) + (native-inputs (list pkg-config)) + (inputs (list openssl)) + (home-page "https://github.com/lipanski/mockito") + (synopsis "HTTP mocking for Rust") + (description "This package provides HTTP mocking for Rust.") (license license:expat))) (define-public rust-multipart-0.18 @@ -3491,8 +4448,242 @@ applications written in Rust. Its API is inspired by the popular @code{express} framework for JavaScript.") (license license:expat))) +(define-public rust-opentelemetry-http-0.10 + (package + (name "rust-opentelemetry-http") + (version "0.10.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "opentelemetry-http" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "17irqlgsqr1f0in5rhvgl224x2gdcycy8w3ybydlyrdyx2f1hlbz")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-async-trait" ,rust-async-trait-0.1) + ("rust-bytes" ,rust-bytes-1) + ("rust-http" ,rust-http-0.2) + ("rust-hyper" ,rust-hyper-0.14) + ("rust-isahc" ,rust-isahc-1) + ("rust-opentelemetry" ,rust-opentelemetry-0.21) + ("rust-reqwest" ,rust-reqwest-0.11) + ("rust-surf" ,rust-surf-2) + ("rust-tokio" ,rust-tokio-1)))) + (home-page "https://github.com/open-telemetry/opentelemetry-rust") + (synopsis "Helpers for exchange of traces and metrics over HTTP") + (description + "This package provides helper implementations for exchange of traces +and metrics over HTTP.") + (license license:asl2.0))) + +(define-public rust-poem-1 + (package + (name "rust-poem") + (version "1.3.59") + (source + (origin + (method url-fetch) + (uri (crate-uri "poem" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0159agmjig6s45sjf1jcbira8icpbakfadwa23pc2i07gg4p8ish")) + (patches (search-patches "rust-poem-1-fewer-deps.patch")))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t ; use of undeclared crate or module `futures_util` + #:cargo-inputs (("rust-anyhow" ,rust-anyhow-1) + ("rust-async-compression" ,rust-async-compression-0.4) + ("rust-async-trait" ,rust-async-trait-0.1) + ("rust-base64" ,rust-base64-0.21) + ("rust-bytes" ,rust-bytes-1) + ("rust-chrono" ,rust-chrono-0.4) + ("rust-cookie" ,rust-cookie-0.17) + ("rust-csrf" ,rust-csrf-0.4) + ;("rust-eyre" ,rust-eyre-0.6) + ;("rust-fluent" ,rust-fluent-0.16) + ;("rust-fluent-langneg" ,rust-fluent-langneg-0.13) + ;("rust-fluent-syntax" ,rust-fluent-syntax-0.11) + ("rust-futures-util" ,rust-futures-util-0.3) + ("rust-headers" ,rust-headers-0.3) + ("rust-hex" ,rust-hex-0.4) + ("rust-http" ,rust-http-0.2) + ("rust-httpdate" ,rust-httpdate-1) + ("rust-hyper" ,rust-hyper-0.14) + ("rust-hyper-rustls" ,rust-hyper-rustls-0.24) + ;("rust-intl-memoizer" ,rust-intl-memoizer-0.5) + ("rust-mime" ,rust-mime-0.3) + ("rust-mime-guess" ,rust-mime-guess-2) + ("rust-multer" ,rust-multer-2) + ("rust-nix" ,rust-nix-0.27) + ("rust-openssl" ,rust-openssl-0.10) + ;("rust-opentelemetry" ,rust-opentelemetry-0.21) + ;("rust-opentelemetry-http" ,rust-opentelemetry-http-0.10) + ;("rust-opentelemetry-prometheus" ,rust-opentelemetry-prometheus-0.14) + ;("rust-opentelemetry-semantic-conventions" ,rust-opentelemetry-semantic-conventions-0.13) + ("rust-parking-lot" ,rust-parking-lot-0.12) + ("rust-percent-encoding" ,rust-percent-encoding-2) + ("rust-pin-project-lite" ,rust-pin-project-lite-0.2) + ("rust-poem-derive" ,rust-poem-derive-1) + ("rust-priority-queue" ,rust-priority-queue-1) + ;("rust-prometheus" ,rust-prometheus-0.13) + ("rust-quick-xml" ,rust-quick-xml-0.30) + ("rust-rand" ,rust-rand-0.8) + ("rust-rcgen" ,rust-rcgen-0.11) + ;("rust-redis" ,rust-redis-0.23) + ("rust-regex" ,rust-regex-1) + ("rust-rfc7239" ,rust-rfc7239-0.1) + ("rust-ring" ,rust-ring-0.16) + ("rust-rust-embed" ,rust-rust-embed-8) + ("rust-rustls-pemfile" ,rust-rustls-pemfile-1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-serde-urlencoded" ,rust-serde-urlencoded-0.7) + ("rust-serde-yaml" ,rust-serde-yaml-0.9) + ("rust-smallvec" ,rust-smallvec-1) + ;("rust-sse-codec" ,rust-sse-codec-0.3) + ("rust-tempfile" ,rust-tempfile-3) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-time" ,rust-time-0.3) + ("rust-tokio" ,rust-tokio-1) + ("rust-tokio-metrics" ,rust-tokio-metrics-0.3) + ("rust-tokio-native-tls" ,rust-tokio-native-tls-0.3) + ("rust-tokio-openssl" ,rust-tokio-openssl-0.6) + ("rust-tokio-rustls" ,rust-tokio-rustls-0.24) + ("rust-tokio-stream" ,rust-tokio-stream-0.1) + ("rust-tokio-tungstenite" ,rust-tokio-tungstenite-0.20) + ("rust-tokio-util" ,rust-tokio-util-0.7) + ("rust-tower" ,rust-tower-0.4) + ("rust-tracing" ,rust-tracing-0.1) + ;("rust-unic-langid" ,rust-unic-langid-0.9) + ("rust-wildmatch" ,rust-wildmatch-2) + ("rust-x509-parser" ,rust-x509-parser-0.15)) + #:cargo-development-inputs (("rust-async-stream" ,rust-async-stream-0.3) + ("rust-tokio" ,rust-tokio-1)))) + (home-page "https://github.com/poem-web/poem") + (synopsis + "Web framework written in the Rust programming language") + (description "Poem is a full-featured and easy-to-use web framework written +in the Rust programming language.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-poem-derive-1 + (package + (name "rust-poem-derive") + (version "1.3.59") + (source + (origin + (method url-fetch) + (uri (crate-uri "poem-derive" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0cdvid2ryn4h9wj7087shf20ijvahh1n44bmwghngn6qh13czpa2")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-proc-macro-crate" ,rust-proc-macro-crate-2) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-2)))) + (home-page "https://github.com/poem-web/poem") + (synopsis "Macros for poem") + (description "This package provides macros for poem.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-reqwest-0.12 + (package + (name "rust-reqwest") + (version "0.12.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "reqwest" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "047aa0qnngnlnf9i0abrs6pgmz15vk81p5pvscwhk3l6jbfsyv2n")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-test-flags '("--release" "--" + "--skip=badssl" + "--skip=test_allowed_methods" + "--skip=test_tls_info" + "--skip=connect_many_timeout" + "--skip=connect_timeout") + #:cargo-inputs + (("rust-async-compression" ,rust-async-compression-0.4) + ("rust-base64" ,rust-base64-0.22) + ("rust-bytes" ,rust-bytes-1) + ("rust-cookie" ,rust-cookie-0.17) + ("rust-cookie-store" ,rust-cookie-store-0.20) + ("rust-encoding-rs" ,rust-encoding-rs-0.8) + ("rust-futures-channel" ,rust-futures-channel-0.3) + ("rust-futures-core" ,rust-futures-core-0.3) + ("rust-futures-util" ,rust-futures-util-0.3) + ("rust-h2" ,rust-h2-0.4) + ("rust-h3" ,rust-h3-0.0.4) + ("rust-h3-quinn" ,rust-h3-quinn-0.0.5) + ("rust-hickory-resolver" ,rust-hickory-resolver-0.24) + ("rust-http" ,rust-http-1) + ("rust-http-body" ,rust-http-body-1) + ("rust-http-body-util" ,rust-http-body-util-0.1) + ("rust-hyper" ,rust-hyper-1) + ("rust-hyper-rustls" ,rust-hyper-rustls-0.26) + ("rust-hyper-tls" ,rust-hyper-tls-0.6) + ("rust-hyper-util" ,rust-hyper-util-0.1) + ("rust-ipnet" ,rust-ipnet-2) + ("rust-js-sys" ,rust-js-sys-0.3) + ("rust-log" ,rust-log-0.4) + ("rust-mime" ,rust-mime-0.3) + ("rust-mime-guess" ,rust-mime-guess-2) + ("rust-native-tls" ,rust-native-tls-0.2) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-percent-encoding" ,rust-percent-encoding-2) + ("rust-pin-project-lite" ,rust-pin-project-lite-0.2) + ("rust-quinn" ,rust-quinn-0.10) + ("rust-rustls" ,rust-rustls-0.22) + ("rust-rustls-native-certs" ,rust-rustls-native-certs-0.7) + ("rust-rustls-pemfile" ,rust-rustls-pemfile-2) + ("rust-rustls-pki-types" ,rust-rustls-pki-types-1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-serde-urlencoded" ,rust-serde-urlencoded-0.7) + ("rust-sync-wrapper" ,rust-sync-wrapper-0.1) + ("rust-system-configuration" ,rust-system-configuration-0.5) + ("rust-tokio" ,rust-tokio-1) + ("rust-tokio-native-tls" ,rust-tokio-native-tls-0.3) + ("rust-tokio-rustls" ,rust-tokio-rustls-0.25) + ("rust-tokio-socks" ,rust-tokio-socks-0.5) + ("rust-tokio-util" ,rust-tokio-util-0.7) + ("rust-tower-service" ,rust-tower-service-0.3) + ("rust-url" ,rust-url-2) + ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2) + ("rust-wasm-bindgen-futures" ,rust-wasm-bindgen-futures-0.4) + ("rust-wasm-streams" ,rust-wasm-streams-0.4) + ("rust-web-sys" ,rust-web-sys-0.3) + ("rust-webpki-roots" ,rust-webpki-roots-0.26) + ("rust-winreg" ,rust-winreg-0.52)) + #:cargo-development-inputs + (("rust-brotli" ,rust-brotli-3) + ("rust-doc-comment" ,rust-doc-comment-0.3) + ("rust-env-logger" ,rust-env-logger-0.10) + ("rust-futures-util" ,rust-futures-util-0.3) + ("rust-hyper" ,rust-hyper-1) + ("rust-hyper-util" ,rust-hyper-util-0.1) + ("rust-libflate" ,rust-libflate-1) + ("rust-serde" ,rust-serde-1) + ("rust-tokio" ,rust-tokio-1) + ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2) + ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3) + ("rust-zstd" ,rust-zstd-0.13)))) + (native-inputs (list pkg-config)) + (inputs (list openssl (list zstd "lib"))) + (home-page "https://github.com/seanmonstar/reqwest") + (synopsis "High level HTTP client library") + (description "This package provides a high level HTTP client library.") + (license (list license:expat license:asl2.0)))) + (define-public rust-reqwest-0.11 (package + (inherit rust-reqwest-0.12) (name "rust-reqwest") (version "0.11.23") (source @@ -3502,7 +4693,6 @@ applications written in Rust. Its API is inspired by the popular (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "0hgvzb7r46656r9vqhl5qk1kbr2xzjb91yr2cb321160ka6sxc9p")))) - (build-system cargo-build-system) (arguments `(#:cargo-test-flags '("--release" "--" @@ -3571,15 +4761,7 @@ applications written in Rust. Its API is inspired by the popular ("rust-serde" ,rust-serde-1) ("rust-tokio" ,rust-tokio-1) ("rust-wasm-bindgen" ,rust-wasm-bindgen-0.2) - ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3)))) - (inputs - (list openssl)) - (native-inputs - (list pkg-config)) - (home-page "https://github.com/seanmonstar/reqwest") - (synopsis "High level HTTP client library") - (description "This package provides a high level HTTP client library.") - (license (list license:expat license:asl2.0)))) + ("rust-wasm-bindgen-test" ,rust-wasm-bindgen-test-0.3)))))) (define-public rust-reqwest-0.10 (package @@ -3656,8 +4838,83 @@ applications written in Rust. Its API is inspired by the popular (inputs (list openssl)))) +(define-public rust-rfc7239-0.1 + (package + (name "rust-rfc7239") + (version "0.1.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "rfc7239" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0ixsyn8y2jfhfqnhwivgil3cvdr4jdr5s0nr7gqq3d3yryrifwq8")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-uncased" ,rust-uncased-0.9)))) + (home-page "https://github.com/icewind1991/rfc7239") + (synopsis "Parser for rfc7239 formatted Forwarded headers") + (description "Parser for rfc7239 formatted Forwarded headers.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-rocket-0.5 + (package + (name "rust-rocket") + (version "0.5.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "rocket" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0l4i93dai7pyzlkvdjkqg2g7ni1r6749cwx4nrrhsrr6rdybaywy")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-async-stream" ,rust-async-stream-0.3) + ("rust-async-trait" ,rust-async-trait-0.1) + ("rust-atomic" ,rust-atomic-0.5) + ("rust-binascii" ,rust-binascii-0.1) + ("rust-bytes" ,rust-bytes-1) + ("rust-either" ,rust-either-1) + ("rust-figment" ,rust-figment-0.10) + ("rust-futures" ,rust-futures-0.3) + ("rust-indexmap" ,rust-indexmap-2) + ("rust-log" ,rust-log-0.4) + ("rust-memchr" ,rust-memchr-2) + ("rust-multer" ,rust-multer-2) + ("rust-num-cpus" ,rust-num-cpus-1) + ("rust-parking-lot" ,rust-parking-lot-0.12) + ("rust-pin-project-lite" ,rust-pin-project-lite-0.2) + ("rust-rand" ,rust-rand-0.8) + ("rust-ref-cast" ,rust-ref-cast-1) + ("rust-rmp-serde" ,rust-rmp-serde-1) + ("rust-rocket-codegen" ,rust-rocket-codegen-0.5) + ("rust-rocket-http" ,rust-rocket-http-0.5) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-state" ,rust-state-0.6) + ("rust-tempfile" ,rust-tempfile-3) + ("rust-time" ,rust-time-0.3) + ("rust-tokio" ,rust-tokio-1) + ("rust-tokio-stream" ,rust-tokio-stream-0.1) + ("rust-tokio-util" ,rust-tokio-util-0.7) + ("rust-ubyte" ,rust-ubyte-0.10) + ("rust-uuid" ,rust-uuid-1) + ("rust-version-check" ,rust-version-check-0.9) + ("rust-yansi" ,rust-yansi-1)) + #:cargo-development-inputs (("rust-figment" ,rust-figment-0.10) + ("rust-pretty-assertions" ,rust-pretty-assertions-1)))) + (home-page "https://rocket.rs") + (synopsis + "Web framework with focus on ease-of-use, expressibility, and speed") + (description + "Rocket is a web framework with a focus on ease-of-use, expressibility, +and speed.") + (license (list license:expat license:asl2.0)))) + (define-public rust-rocket-0.4 (package + (inherit rust-rocket-0.5) (name "rust-rocket") (version "0.4.7") (source @@ -3667,7 +4924,6 @@ applications written in Rust. Its API is inspired by the popular (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "04ybnhjw92zaan92lsmx6mkhqc9cpsg3885svb3wzyj39pyzvsvz")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs @@ -3684,17 +4940,45 @@ applications written in Rust. Its API is inspired by the popular ("rust-toml" ,rust-toml-0.4) ("rust-version-check" ,rust-version-check-0.9) ("rust-yansi" ,rust-yansi-0.5) - ("rust-yansi" ,rust-yansi-0.5)))) + ("rust-yansi" ,rust-yansi-0.5)))))) + +(define-public rust-rocket-codegen-0.5 + (package + (name "rust-rocket-codegen") + (version "0.5.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "rocket_codegen" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0k6hdf9s9y73kzj89qs688gnfjj1sl4imp6pdjz22pzpmdk808x2")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; can't find crate for `rocket` + #:cargo-inputs (("rust-devise" ,rust-devise-0.4) + ("rust-glob" ,rust-glob-0.3) + ("rust-indexmap" ,rust-indexmap-2) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-rocket-http" ,rust-rocket-http-0.5) + ("rust-syn" ,rust-syn-2) + ("rust-unicode-xid" ,rust-unicode-xid-0.2) + ("rust-version-check" ,rust-version-check-0.9)) + #:cargo-development-inputs + (("rust-pretty-assertions" ,rust-pretty-assertions-1) + ("rust-time" ,rust-time-0.3) + ("rust-trybuild" ,rust-trybuild-1) + ("rust-version-check" ,rust-version-check-0.9)))) (home-page "https://rocket.rs") - (synopsis - "Web framework with focus on ease-of-use, expressibility, and speed") + (synopsis "Procedural macros for the Rocket web framework") (description - "Rocket is a web framework with a focus on ease-of-use, expressibility, -and speed.") + "This package provides procedural macros for the Rocket web framework.") (license (list license:expat license:asl2.0)))) (define-public rust-rocket-codegen-0.4 (package + (inherit rust-rocket-codegen-0.5) (name "rust-rocket-codegen") (version "0.4.7") (source @@ -3704,7 +4988,6 @@ and speed.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "18s2dll8c4sd26s8cfr6cizj5z55xwnk6r6x7b2wvcf8n9ajrb6f")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs @@ -3714,15 +4997,56 @@ and speed.") ("rust-quote" ,rust-quote-0.6) ("rust-rocket-http" ,rust-rocket-http-0.4) ("rust-version-check" ,rust-version-check-0.9) - ("rust-yansi" ,rust-yansi-0.5)))) + ("rust-yansi" ,rust-yansi-0.5)))))) + +(define-public rust-rocket-http-0.5 + (package + (name "rust-rocket-http") + (version "0.5.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "rocket_http" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "17iq208zf9rfxdnx8hfjxnn51074cc9li99yjigzwnfhjhv6d89p")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; can't find crate for `rocket` + #:cargo-inputs (("rust-cookie" ,rust-cookie-0.18) + ("rust-either" ,rust-either-1) + ("rust-futures" ,rust-futures-0.3) + ("rust-http" ,rust-http-0.2) + ("rust-hyper" ,rust-hyper-0.14) + ("rust-indexmap" ,rust-indexmap-2) + ("rust-log" ,rust-log-0.4) + ("rust-memchr" ,rust-memchr-2) + ("rust-pear" ,rust-pear-0.2) + ("rust-percent-encoding" ,rust-percent-encoding-2) + ("rust-pin-project-lite" ,rust-pin-project-lite-0.2) + ("rust-ref-cast" ,rust-ref-cast-1) + ("rust-rustls" ,rust-rustls-0.21) + ("rust-rustls-pemfile" ,rust-rustls-pemfile-1) + ("rust-serde" ,rust-serde-1) + ("rust-smallvec" ,rust-smallvec-1) + ("rust-stable-pattern" ,rust-stable-pattern-0.1) + ("rust-state" ,rust-state-0.6) + ("rust-time" ,rust-time-0.3) + ("rust-tokio" ,rust-tokio-1) + ("rust-tokio-rustls" ,rust-tokio-rustls-0.24) + ("rust-uncased" ,rust-uncased-0.9) + ("rust-uuid" ,rust-uuid-1) + ("rust-x509-parser" ,rust-x509-parser-0.13)))) (home-page "https://rocket.rs") - (synopsis "Procedural macros for the Rocket web framework") + (synopsis "HTTP requests, responses and headers tooling for Rocket") (description - "This package provides procedural macros for the Rocket web framework.") + "This package provides types, traits, and parsers for HTTP requests, +responses, and headers for the Rocket web framework.") (license (list license:expat license:asl2.0)))) (define-public rust-rocket-http-0.4 (package + (inherit rust-rocket-http-0.5) (name "rust-rocket-http") (version "0.4.7") (source @@ -3732,7 +5056,6 @@ and speed.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "0ga98nbcga8amg4xhrfkn1wljnqx9h0vv7mnay9g66vsxl042dnf")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs @@ -3746,12 +5069,187 @@ and speed.") ("rust-smallvec" ,rust-smallvec-1) ("rust-state" ,rust-state-0.4) ("rust-time" ,rust-time-0.1) - ("rust-unicode-xid" ,rust-unicode-xid-0.1)))) - (home-page "https://rocket.rs") - (synopsis "HTTP requests, responses and headers tooling for Rocket") + ("rust-unicode-xid" ,rust-unicode-xid-0.1)))))) + +(define-public rust-salvo-0.16 + (package + (name "rust-salvo") + (version "0.16.8") + (source + (origin + (method url-fetch) + (uri (crate-uri "salvo" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1jw9h9aac4ms9shvssc8mw53q9842f5bfqv1a8aqkpcyd2j23n4b")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; use of undeclared crate or module `salvo_extra` + #:cargo-inputs (("rust-salvo-core" ,rust-salvo-core-0.16) + ("rust-salvo-extra" ,rust-salvo-extra-0.16)) + #:cargo-development-inputs + (("rust-async-stream" ,rust-async-stream-0.3) + ("rust-chrono" ,rust-chrono-0.4) + ("rust-futures-util" ,rust-futures-util-0.3) + ("rust-hyper" ,rust-hyper-0.14) + ("rust-jsonwebtoken" ,rust-jsonwebtoken-7) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-derive" ,rust-serde-derive-1) + ("rust-tokio" ,rust-tokio-1) + ("rust-tokio-stream" ,rust-tokio-stream-0.1) + ("rust-tower" ,rust-tower-0.4) + ("rust-tracing" ,rust-tracing-0.1) + ("rust-tracing-log" ,rust-tracing-log-0.1) + ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3)))) + (home-page "https://salvo.rs") + (synopsis "Salvo is a web framework") (description - "This package provides types, traits, and parsers for HTTP requests, -responses, and headers for the Rocket web framework.") + "Salvo is a powerful web framework that can make your work easier.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-salvo-core-0.16 + (package + (name "rust-salvo-core") + (version "0.16.8") + (source + (origin + (method url-fetch) + (uri (crate-uri "salvo_core" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "01dazprfzmjmvwgcrvqxjd12hgwwlk71mskwyl4cj2y2gm5p80bv")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-test-flags + '("--release" "--" + "--skip=fs::test::test_named_file_builder" + "--skip=routing::filter::path::tests::test_parse_multi_regex" + "--skip=routing::filter::path::tests::test_parse_multi_regex_with_prefix" + "--skip=routing::filter::path::tests::test_parse_multi_regex_with_prefix_and_suffix" + "--skip=routing::filter::path::tests::test_parse_multi_regex_with_suffix" + "--skip=routing::filter::path::tests::test_parse_single_regex" + "--skip=routing::filter::path::tests::test_parse_single_regex_with_prefix" + "--skip=routing::filter::path::tests::test_parse_single_regex_with_prefix_and_suffix" + "--skip=routing::filter::path::tests::test_parse_single_regex_with_suffix" + "--skip=routing::filter::path::tests::test_parse_wildcard_regex") + #:cargo-inputs (("rust-anyhow" ,rust-anyhow-1) + ("rust-async-compression" ,rust-async-compression-0.3) + ("rust-async-trait" ,rust-async-trait-0.1) + ("rust-bitflags" ,rust-bitflags-1) + ("rust-bytes" ,rust-bytes-1) + ("rust-cookie" ,rust-cookie-0.16) + ("rust-encoding-rs" ,rust-encoding-rs-0.8) + ("rust-fastrand" ,rust-fastrand-1) + ("rust-form-urlencoded" ,rust-form-urlencoded-1) + ("rust-futures-util" ,rust-futures-util-0.3) + ("rust-headers" ,rust-headers-0.3) + ("rust-http" ,rust-http-0.2) + ("rust-hyper" ,rust-hyper-0.14) + ("rust-mime" ,rust-mime-0.3) + ("rust-mime-guess" ,rust-mime-guess-2) + ("rust-multer" ,rust-multer-2) + ("rust-multimap" ,rust-multimap-0.8) + ("rust-num-cpus" ,rust-num-cpus-1) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-percent-encoding" ,rust-percent-encoding-2) + ("rust-pin-project-lite" ,rust-pin-project-lite-0.2) + ("rust-pin-utils" ,rust-pin-utils-0.1) + ("rust-rand" ,rust-rand-0.8) + ("rust-regex" ,rust-regex-1) + ("rust-rustls-pemfile" ,rust-rustls-pemfile-0.2) + ("rust-salvo-macros" ,rust-salvo-macros-0.16) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-tempdir" ,rust-tempdir-0.3) + ("rust-textnonce" ,rust-textnonce-1) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-tokio" ,rust-tokio-1) + ("rust-tokio-native-tls" ,rust-tokio-native-tls-0.3) + ("rust-tokio-rustls" ,rust-tokio-rustls-0.23) + ("rust-tokio-stream" ,rust-tokio-stream-0.1) + ("rust-tracing" ,rust-tracing-0.1)) + #:cargo-development-inputs (("rust-reqwest" ,rust-reqwest-0.11)))) + (inputs (list openssl)) + (native-inputs (list pkg-config)) + (home-page "https://salvo.rs") + (synopsis "Core components of the Salvo web framework") + (description + "This package provides the core components of the Salvo web framework.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-salvo-extra-0.16 + (package + (name "rust-salvo-extra") + (version "0.16.8") + (source + (origin + (method url-fetch) + (uri (crate-uri "salvo_extra" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "023wagm5mpkp1jnpggllbddqigsy5h4qnw2lk8m3j25fj61fl3iy")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-test-flags '("--release" "--" + "--skip=proxy::tests::test_proxy" + "--skip=serve::tests::test_serve_static_files" + "--skip=sse::tests::test_sse_retry") + #:cargo-inputs (("rust-async-compression" ,rust-async-compression-0.3) + ("rust-async-session" ,rust-async-session-3) + ("rust-base64" ,rust-base64-0.13) + ("rust-chrono" ,rust-chrono-0.4) + ("rust-cookie" ,rust-cookie-0.16) + ("rust-csrf" ,rust-csrf-0.4) + ("rust-futures-util" ,rust-futures-util-0.3) + ("rust-hkdf" ,rust-hkdf-0.12) + ("rust-hyper" ,rust-hyper-0.14) + ("rust-hyper-rustls" ,rust-hyper-rustls-0.23) + ("rust-jsonwebtoken" ,rust-jsonwebtoken-7) + ("rust-mime" ,rust-mime-0.3) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-percent-encoding" ,rust-percent-encoding-2) + ("rust-pin-project" ,rust-pin-project-1) + ("rust-salvo-core" ,rust-salvo-core-0.16) + ("rust-serde" ,rust-serde-1) + ("rust-serde-derive" ,rust-serde-derive-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-sha2" ,rust-sha2-0.10) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-tokio" ,rust-tokio-1) + ("rust-tokio-stream" ,rust-tokio-stream-0.1) + ("rust-tokio-tungstenite" ,rust-tokio-tungstenite-0.16) + ("rust-tokio-util" ,rust-tokio-util-0.6) + ("rust-tracing" ,rust-tracing-0.1)) + #:cargo-development-inputs (("rust-reqwest" ,rust-reqwest-0.11)))) + (inputs (list openssl)) + (native-inputs (list pkg-config)) + (home-page "https://salvo.rs") + (synopsis "Extra components of the Salvo web framework") + (description + "This package provides the extra components of the Salvo web framework.") + (license (list license:expat license:asl2.0)))) + +(define-public rust-salvo-macros-0.16 + (package + (name "rust-salvo-macros") + (version "0.16.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "salvo_macros" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0hdlzvcv2vvbr60w1kmfr9bx8glx4xs9g0ry1pwa7yf7ig987z90")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-proc-macro-crate" ,rust-proc-macro-crate-1) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-proc-quote" ,rust-proc-quote-0.4) + ("rust-syn" ,rust-syn-1)))) + (home-page "https://salvo.rs") + (synopsis "Salvo proc macros") + (description "This package provides proc macros for salvo.") (license (list license:expat license:asl2.0)))) (define-public rust-stdweb-0.4 @@ -3919,29 +5417,32 @@ crate.") (define-public rust-surf-2 (package (name "rust-surf") - (version "2.2.0") + (version "2.3.2") (source (origin (method url-fetch) (uri (crate-uri "surf" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0a33kw06jspi54rf38ncyqjj8861bid0wxhwzpk1ypkbr8rls59a")))) + (base32 "1mwd0fj0pcdd1q3qp4r045znf0gnvsq1s0pzxlnrhl83npk1m2vi")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs - (("rust-async-std" ,rust-async-std-1) + (("rust-async-native-tls" ,rust-async-native-tls-0.3) + ("rust-async-std" ,rust-async-std-1) ("rust-async-trait" ,rust-async-trait-0.1) ("rust-cfg-if" ,rust-cfg-if-1) ("rust-encoding-rs" ,rust-encoding-rs-0.8) ("rust-futures-util" ,rust-futures-util-0.3) + ("rust-getrandom" ,rust-getrandom-0.2) ("rust-http-client" ,rust-http-client-6) ("rust-http-types" ,rust-http-types-2) ("rust-log" ,rust-log-0.4) ("rust-mime-guess" ,rust-mime-guess-2) ("rust-once-cell" ,rust-once-cell-1) ("rust-pin-project-lite" ,rust-pin-project-lite-0.2) + ("rust-rustls" ,rust-rustls-0.18) ("rust-serde" ,rust-serde-1) ("rust-serde-json" ,rust-serde-json-1) ("rust-web-sys" ,rust-web-sys-0.3)))) @@ -3983,6 +5484,32 @@ alike. It's completely modular, and built directly for @code{async/await}.") (description "This package provides a low level HTTP server library.") (license (list license:expat license:asl2.0)))) +(define-public rust-tiny-http-0.11 + (package + (inherit rust-tiny-http-0.12) + (name "rust-tiny-http") + (version "0.11.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "tiny_http" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1jkpniq72ppbhppyxd2q36kjji05qljsvv1fhvxiwg6j217fzmp0")))) + (arguments + `(#:cargo-inputs (("rust-ascii" ,rust-ascii-1) + ("rust-chunked-transfer" ,rust-chunked-transfer-1) + ("rust-log" ,rust-log-0.4) + ("rust-openssl" ,rust-openssl-0.10) + ("rust-rustls" ,rust-rustls-0.20) + ("rust-rustls-pemfile" ,rust-rustls-pemfile-0.2) + ("rust-time" ,rust-time-0.3) + ("rust-url" ,rust-url-2) + ("rust-zeroize" ,rust-zeroize-1)) + #:cargo-development-inputs (("rust-fdlimit" ,rust-fdlimit-0.1) + ("rust-rustc-serialize" ,rust-rustc-serialize-0.3) + ("rust-sha1" ,rust-sha1-0.6)))))) + (define-public rust-tiny-http-0.6 (package (inherit rust-tiny-http-0.12) @@ -4058,6 +5585,58 @@ alike. It's completely modular, and built directly for @code{async/await}.") on high performance, interoperability, and flexibility.") (license license:expat))) +(define-public rust-tonic-0.8 + (package + (inherit rust-tonic-0.10) + (name "rust-tonic") + (version "0.8.3") + (source + (origin + (method url-fetch) + (uri (crate-uri "tonic" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1yymp2xi1p60g81p5jfaybcawpfkb01vqvzqn4cyz6wj7fnry8cg")))) + (arguments + `(#:cargo-test-flags '("--release" "--lib" "--bins" "--tests") + #:cargo-inputs (("rust-async-stream" ,rust-async-stream-0.3) + ("rust-async-trait" ,rust-async-trait-0.1) + ("rust-axum" ,rust-axum-0.6) + ("rust-base64" ,rust-base64-0.13) + ("rust-bytes" ,rust-bytes-1) + ("rust-flate2" ,rust-flate2-1) + ("rust-futures-core" ,rust-futures-core-0.3) + ("rust-futures-util" ,rust-futures-util-0.3) + ("rust-h2" ,rust-h2-0.3) + ("rust-http" ,rust-http-0.2) + ("rust-http-body" ,rust-http-body-0.4) + ("rust-hyper" ,rust-hyper-0.14) + ("rust-hyper-timeout" ,rust-hyper-timeout-0.4) + ("rust-percent-encoding" ,rust-percent-encoding-2) + ("rust-pin-project" ,rust-pin-project-1) + ("rust-prost" ,rust-prost-0.11) + ("rust-prost-derive" ,rust-prost-derive-0.11) + ("rust-rustls-native-certs" ,rust-rustls-native-certs-0.6) + ("rust-rustls-pemfile" ,rust-rustls-pemfile-1) + ("rust-tokio" ,rust-tokio-1) + ("rust-tokio-rustls" ,rust-tokio-rustls-0.23) + ("rust-tokio-stream" ,rust-tokio-stream-0.1) + ("rust-tokio-util" ,rust-tokio-util-0.7) + ("rust-tower" ,rust-tower-0.4) + ("rust-tower-layer" ,rust-tower-layer-0.3) + ("rust-tower-service" ,rust-tower-service-0.3) + ("rust-tracing" ,rust-tracing-0.1) + ("rust-tracing-futures" ,rust-tracing-futures-0.2) + ("rust-webpki-roots" ,rust-webpki-roots-0.22)) + #:cargo-development-inputs + (("rust-bencher" ,rust-bencher-0.1) + ("rust-quickcheck" ,rust-quickcheck-1) + ("rust-quickcheck-macros" ,rust-quickcheck-macros-1) + ("rust-rand" ,rust-rand-0.8) + ("rust-static-assertions" ,rust-static-assertions-1) + ("rust-tokio" ,rust-tokio-1) + ("rust-tower" ,rust-tower-0.4)))))) + (define-public rust-tonic-0.6 (package (inherit rust-tonic-0.10) @@ -4179,8 +5758,75 @@ on high performance, interoperability, and flexibility.") robust clients and servers.") (license license:expat))) +(define-public rust-tower-http-0.5 + (package + (name "rust-tower-http") + (version "0.5.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "tower-http" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0bmgfh1hr92blw7kv2636ykd0gf3h0aqdd89kvjk6b2fg8kr788d")) + (modules '((guix build utils))) + (snippet '(begin + ;; Remove disabled doctests with unresolved imports. + (substitute* "src/lib.rs" (("//!.*") "")) + (substitute* "src/classify/status_in_range_is_error.rs" + (("///.*") "")))))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-async-compression" ,rust-async-compression-0.4) + ("rust-base64" ,rust-base64-0.21) + ("rust-bitflags" ,rust-bitflags-2) + ("rust-bytes" ,rust-bytes-1) + ("rust-futures-core" ,rust-futures-core-0.3) + ("rust-futures-util" ,rust-futures-util-0.3) + ("rust-http" ,rust-http-1) + ("rust-http-body" ,rust-http-body-1) + ("rust-http-body-util" ,rust-http-body-util-0.1) + ("rust-http-range-header" ,rust-http-range-header-0.4) + ("rust-httpdate" ,rust-httpdate-1) + ("rust-iri-string" ,rust-iri-string-0.7) + ("rust-mime" ,rust-mime-0.3) + ("rust-mime-guess" ,rust-mime-guess-2) + ("rust-percent-encoding" ,rust-percent-encoding-2) + ("rust-pin-project-lite" ,rust-pin-project-lite-0.2) + ("rust-tokio" ,rust-tokio-1) + ("rust-tokio-util" ,rust-tokio-util-0.7) + ("rust-tower" ,rust-tower-0.4) + ("rust-tower-layer" ,rust-tower-layer-0.3) + ("rust-tower-service" ,rust-tower-service-0.3) + ("rust-tracing" ,rust-tracing-0.1) + ("rust-uuid" ,rust-uuid-1)) + #:cargo-development-inputs + (("rust-async-trait" ,rust-async-trait-0.1) + ("rust-brotli" ,rust-brotli-3) + ("rust-bytes" ,rust-bytes-1) + ("rust-flate2" ,rust-flate2-1) + ("rust-futures-util" ,rust-futures-util-0.3) + ("rust-hyper-util" ,rust-hyper-util-0.1) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-sync-wrapper" ,rust-sync-wrapper-0.1) + ("rust-tokio" ,rust-tokio-1) + ("rust-tower" ,rust-tower-0.4) + ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3) + ("rust-uuid" ,rust-uuid-1) + ("rust-zstd" ,rust-zstd-0.12)))) + (native-inputs (list pkg-config)) + (inputs (list (list zstd "lib"))) + (home-page "https://github.com/tower-rs/tower-http") + (synopsis "Tower middleware and utilities for HTTP clients and servers") + (description + "This package provides Tower middleware and utilities for HTTP +clients and servers.") + (license license:expat))) + (define-public rust-tower-http-0.4 (package + (inherit rust-tower-http-0.5) (name "rust-tower-http") (version "0.4.4") (source @@ -4190,7 +5836,6 @@ robust clients and servers.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "0h0i2flrw25zwxv72sifq4v5mwcb030spksy7r2a4xl2d4fvpib1")))) - (build-system cargo-build-system) (arguments `(#:cargo-test-flags (list "--release" ;; Not the doc tests. @@ -4229,12 +5874,7 @@ robust clients and servers.") ("rust-tower" ,rust-tower-0.4) ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3) ("rust-uuid" ,rust-uuid-1) - ("rust-zstd" ,rust-zstd-0.12)))) - (home-page "https://github.com/tower-rs/tower-http") - (synopsis "Tower middleware and utilities for HTTP clients and servers") - (description "This package provides the tower middleware and utilities for -HTTP clients and servers.") - (license license:expat))) + ("rust-zstd" ,rust-zstd-0.12)))))) (define-public rust-tower-layer-0.3 (package @@ -4495,18 +6135,18 @@ the Trust-DNS client to use DNS over HTTPS.") (("rust-env-logger" ,rust-env-logger-0.7) ("rust-futures" ,rust-futures-0.3)))))) -(define-public rust-trust-dns-https-0.18 +(define-public rust-trust-dns-https-0.18.0-alpha.2 (package (inherit rust-trust-dns-https-0.19) (name "rust-trust-dns-https") - (version "0.18.1") + (version "0.18.0-alpha.2") (source (origin (method url-fetch) (uri (crate-uri "trust-dns-https" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "03dapd5larsjlpk6mr4xnm2sb0h7l6dg988wjnaxd8zfi5swq5nl")))) + (base32 "10mad0ys35mp0w91pydk0pzxqd0q2yqvwcf4ppfww7s0l7m8dyid")))) (arguments `(#:tests? #false ;network unreachable #:cargo-inputs @@ -4520,8 +6160,8 @@ the Trust-DNS client to use DNS over HTTPS.") ("rust-rustls" ,rust-rustls-0.16) ("rust-tokio" ,rust-tokio-0.2) ("rust-tokio-rustls" ,rust-tokio-rustls-0.12) - ("rust-trust-dns-proto" ,rust-trust-dns-proto-0.18) - ("rust-trust-dns-rustls" ,rust-trust-dns-rustls-0.18) + ("rust-trust-dns-proto" ,rust-trust-dns-proto-0.18.0-alpha.2) + ("rust-trust-dns-rustls" ,rust-trust-dns-rustls-0.18.0-alpha.2) ("rust-typed-headers" ,rust-typed-headers-0.2) ("rust-webpki" ,rust-webpki-0.21) ("rust-webpki-roots" ,rust-webpki-roots-0.18)) @@ -4621,27 +6261,30 @@ extension for the Trust-DNS client to use native-tls for TLS.") (inputs (list openssl)))) -(define-public rust-trust-dns-native-tls-0.18 +(define-public rust-trust-dns-native-tls-0.18.0-alpha.2 (package (inherit rust-trust-dns-native-tls-0.19) (name "rust-trust-dns-native-tls") - (version "0.18.1") + (version "0.18.0-alpha.2") (source (origin (method url-fetch) (uri (crate-uri "trust-dns-native-tls" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0rcg018vdd5chd4hcmjp753qjlf4k311nmrxa5ay2hxjllzmqd1y")))) + (base32 "0z99xb24g75lpfg57k91bf4s6niw9aq2dd4bwzlgbfm97byi7akb")))) (build-system cargo-build-system) (arguments - `(#:tests? #false ;missing files + `(#:cargo-test-flags + '("--release" "--" + ;; Not all files included. + "--skip=tests::test_tls_client_stream_ipv4") #:cargo-inputs (("rust-futures" ,rust-futures-0.3) ("rust-native-tls" ,rust-native-tls-0.2) ("rust-tokio" ,rust-tokio-0.2) ("rust-tokio-tls" ,rust-tokio-tls-0.3) - ("rust-trust-dns-proto" ,rust-trust-dns-proto-0.18)))))) + ("rust-trust-dns-proto" ,rust-trust-dns-proto-0.18.0-alpha.2)))))) (define-public rust-trust-dns-native-tls-0.6 (package @@ -4721,25 +6364,25 @@ extension for the Trust-DNS client to use tokio-openssl for TLS.") (inputs (list openssl)))) -(define-public rust-trust-dns-openssl-0.18 +(define-public rust-trust-dns-openssl-0.18.0-alpha.2 (package (inherit rust-trust-dns-openssl-0.19) (name "rust-trust-dns-openssl") - (version "0.18.1") + (version "0.18.0-alpha.2") (source (origin (method url-fetch) (uri (crate-uri "trust-dns-openssl" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1870s27ifsdh9plgcwwbxzvlw17r3dn9v6s0zfryf6kfp9hzpfz2")))) + (base32 "16h58wlwgm4jhadi0vxnppdbxlhnxnfid9jxwgnv2fs4d8q9dhg9")))) (arguments `(#:cargo-inputs (("rust-futures" ,rust-futures-0.3) ("rust-openssl" ,rust-openssl-0.10) ("rust-tokio" ,rust-tokio-0.2) ("rust-tokio-openssl" ,rust-tokio-openssl-0.4) - ("rust-trust-dns-proto" ,rust-trust-dns-proto-0.18)) + ("rust-trust-dns-proto" ,rust-trust-dns-proto-0.18.0-alpha.2)) #:cargo-development-inputs (("rust-openssl" ,rust-openssl-0.10) ("rust-tokio" ,rust-tokio-0.2)))))) @@ -4961,18 +6604,18 @@ DNS protocol library for all Trust-DNS projects.") ("rust-futures" ,rust-futures-0.3) ("rust-tokio" ,rust-tokio-0.2)))))) -(define-public rust-trust-dns-proto-0.18 +(define-public rust-trust-dns-proto-0.18.0-alpha.2 (package (inherit rust-trust-dns-proto-0.19) (name "rust-trust-dns-proto") - (version "0.18.1") + (version "0.18.0-alpha.2") (source (origin (method url-fetch) (uri (crate-uri "trust-dns-proto" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1vmhw7vdaa6b7wfv438f272ijjl2qlpcp6b1myvif4iay8pp4fi5")))) + (base32 "0gs15ckm4d4s59jqmm35lbpx7mvylrk8hiialpnga6d9p0m3lzra")))) (arguments `(#:cargo-inputs (("rust-async-trait" ,rust-async-trait-0.1) @@ -5201,21 +6844,35 @@ other queries.") (("rust-env-logger" ,rust-env-logger-0.7) ("rust-futures" ,rust-futures-0.3)))))) -(define-public rust-trust-dns-resolver-0.18 +(define-public rust-trust-dns-resolver-0.18.0-alpha.2 (package (inherit rust-trust-dns-resolver-0.19) (name "rust-trust-dns-resolver") - (version "0.18.1") + (version "0.18.0-alpha.2") (source (origin (method url-fetch) (uri (crate-uri "trust-dns-resolver" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0cldg6y937il4kjk7rirgfhmk0chz41w7qys9h96skaznh4dzmvj")))) + (base32 "0bsal2vz7q3fqdyxa0j1rbbh1hm8mxxv7mf62hjqnvr25d8b343g")))) (build-system cargo-build-system) (arguments - `(#:tests? #false ;network unreachable + `(#:cargo-test-flags + '("--release" "--lib" "--bins" "--tests" "--" + "--skip=async_resolver::tests::test_domain_search" + "--skip=async_resolver::tests::test_fqdn" + "--skip=async_resolver::tests::test_idna" + "--skip=async_resolver::tests::test_large_ndots" + "--skip=async_resolver::tests::test_lookup_cloudflare" + "--skip=async_resolver::tests::test_lookup_google" + "--skip=async_resolver::tests::test_lookup_quad9" + "--skip=async_resolver::tests::test_ndots" + "--skip=async_resolver::tests::test_search_list" + "--skip=hosts::tests::test_read_hosts_conf" + "--skip=name_server::name_server::tests::test_name_server" + "--skip=resolver::tests::test_lookup" + "--skip=system_conf::unix::tests::test_read_resolv_conf") #:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-0.1) ("rust-failure" ,rust-failure-0.1) @@ -5229,11 +6886,11 @@ other queries.") ("rust-serde" ,rust-serde-1) ("rust-smallvec" ,rust-smallvec-1) ("rust-tokio" ,rust-tokio-0.2) - ("rust-trust-dns-https" ,rust-trust-dns-https-0.18) - ("rust-trust-dns-native-tls" ,rust-trust-dns-native-tls-0.18) - ("rust-trust-dns-openssl" ,rust-trust-dns-openssl-0.18) - ("rust-trust-dns-proto" ,rust-trust-dns-proto-0.18) - ("rust-trust-dns-rustls" ,rust-trust-dns-rustls-0.18) + ("rust-trust-dns-https" ,rust-trust-dns-https-0.18.0-alpha.2) + ("rust-trust-dns-native-tls" ,rust-trust-dns-native-tls-0.18.0-alpha.2) + ("rust-trust-dns-openssl" ,rust-trust-dns-openssl-0.18.0-alpha.2) + ("rust-trust-dns-proto" ,rust-trust-dns-proto-0.18.0-alpha.2) + ("rust-trust-dns-rustls" ,rust-trust-dns-rustls-0.18.0-alpha.2) ("rust-webpki-roots" ,rust-webpki-roots-0.18)) #:cargo-development-inputs (("rust-env-logger" ,rust-env-logger-0.7) @@ -5338,28 +6995,31 @@ the Trust-DNS client to use rustls for TLS.") (inputs (list openssl)))) -(define-public rust-trust-dns-rustls-0.18 +(define-public rust-trust-dns-rustls-0.18.0-alpha.2 (package (inherit rust-trust-dns-rustls-0.19) (name "rust-trust-dns-rustls") - (version "0.18.1") + (version "0.18.0-alpha.2") (source (origin (method url-fetch) (uri (crate-uri "trust-dns-rustls" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "19vhb0xsyr0wy4p0liwhv4rqmwv6szfmmid6439gq7wah1x1hzp4")))) + (base32 "1qbqn9isrn9awbbhfd72nfqx529idzwdc025ga85vqpxkpryadhc")))) (build-system cargo-build-system) (arguments - `(#:tests? #false ;missing file + `(#:cargo-test-flags + '("--release" "--" + ;; Not all files included. + "--skip=tests::test_tls_client_stream_ipv4") #:cargo-inputs (("rust-futures" ,rust-futures-0.3) ("rust-log" ,rust-log-0.4) ("rust-rustls" ,rust-rustls-0.16) ("rust-tokio" ,rust-tokio-0.2) ("rust-tokio-rustls" ,rust-tokio-rustls-0.12) - ("rust-trust-dns-proto" ,rust-trust-dns-proto-0.18) + ("rust-trust-dns-proto" ,rust-trust-dns-proto-0.18.0-alpha.2) ("rust-webpki" ,rust-webpki-0.21)) #:cargo-development-inputs (("rust-openssl" ,rust-openssl-0.10)))))) @@ -5397,39 +7057,40 @@ the Trust-DNS client to use rustls for TLS.") (("rust-openssl" ,rust-openssl-0.10) ("rust-tokio" ,rust-tokio-0.1)))))) -(define-public rust-tungstenite-0.20 +(define-public rust-tungstenite-0.21 (package (name "rust-tungstenite") - (version "0.20.1") + (version "0.21.0") (source (origin (method url-fetch) (uri (crate-uri "tungstenite" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1fbgcv3h4h1bhhf5sqbwqsp7jnc44bi4m41sgmhzdsk2zl8aqgcy")))) + (base32 "1qaphb5kgwgid19p64grhv2b9kxy7f1059yy92l9kwrlx90sdwcy")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-byteorder" ,rust-byteorder-1) ("rust-bytes" ,rust-bytes-1) ("rust-data-encoding" ,rust-data-encoding-2) - ("rust-http" ,rust-http-0.2) + ("rust-http" ,rust-http-1) ("rust-httparse" ,rust-httparse-1) ("rust-log" ,rust-log-0.4) ("rust-native-tls" ,rust-native-tls-0.2) ("rust-rand" ,rust-rand-0.8) - ("rust-rustls" ,rust-rustls-0.21) - ("rust-rustls-native-certs" ,rust-rustls-native-certs-0.6) + ("rust-rustls" ,rust-rustls-0.22) + ("rust-rustls-native-certs" ,rust-rustls-native-certs-0.7) + ("rust-rustls-pki-types" ,rust-rustls-pki-types-1) ("rust-sha1" ,rust-sha1-0.10) ("rust-thiserror" ,rust-thiserror-1) ("rust-url" ,rust-url-2) ("rust-utf-8" ,rust-utf-8-0.7) - ("rust-webpki-roots" ,rust-webpki-roots-0.24)) + ("rust-webpki-roots" ,rust-webpki-roots-0.26)) #:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.5) ("rust-env-logger" ,rust-env-logger-0.10) ("rust-input-buffer" ,rust-input-buffer-0.5) - ("rust-net2" ,rust-net2-0.2) - ("rust-rand" ,rust-rand-0.8)))) + ("rust-rand" ,rust-rand-0.8) + ("rust-socket2" ,rust-socket2-0.5)))) (home-page "https://github.com/snapview/tungstenite-rs") (synopsis "Lightweight stream-based WebSocket implementation") (description @@ -5440,6 +7101,40 @@ design abstracts away all the internals of the WebSocket protocol but still makes them accessible for those who wants full control over the network.") (license (list license:expat license:asl2.0)))) +(define-public rust-tungstenite-0.20 + (package + (inherit rust-tungstenite-0.21) + (name "rust-tungstenite") + (version "0.20.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "tungstenite" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1fbgcv3h4h1bhhf5sqbwqsp7jnc44bi4m41sgmhzdsk2zl8aqgcy")))) + (arguments + `(#:cargo-inputs (("rust-byteorder" ,rust-byteorder-1) + ("rust-bytes" ,rust-bytes-1) + ("rust-data-encoding" ,rust-data-encoding-2) + ("rust-http" ,rust-http-0.2) + ("rust-httparse" ,rust-httparse-1) + ("rust-log" ,rust-log-0.4) + ("rust-native-tls" ,rust-native-tls-0.2) + ("rust-rand" ,rust-rand-0.8) + ("rust-rustls" ,rust-rustls-0.21) + ("rust-rustls-native-certs" ,rust-rustls-native-certs-0.6) + ("rust-sha1" ,rust-sha1-0.10) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-url" ,rust-url-2) + ("rust-utf-8" ,rust-utf-8-0.7) + ("rust-webpki-roots" ,rust-webpki-roots-0.24)) + #:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.5) + ("rust-env-logger" ,rust-env-logger-0.10) + ("rust-input-buffer" ,rust-input-buffer-0.5) + ("rust-net2" ,rust-net2-0.2) + ("rust-rand" ,rust-rand-0.8)))))) + (define-public rust-tungstenite-0.19 (package (inherit rust-tungstenite-0.20) @@ -5477,6 +7172,41 @@ makes them accessible for those who wants full control over the network.") ("rust-net2" ,rust-net2-0.2) ("rust-rand" ,rust-rand-0.8)))))) +(define-public rust-tungstenite-0.16 + (package + (inherit rust-tungstenite-0.21) + (name "rust-tungstenite") + (version "0.16.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "tungstenite" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1l9s7gi9kgl4zynhbyb7737lmwaxaim4b818lwi7y95f2hx73lva")))) + (arguments + `(#:cargo-inputs (("rust-base64" ,rust-base64-0.13) + ("rust-byteorder" ,rust-byteorder-1) + ("rust-bytes" ,rust-bytes-1) + ("rust-http" ,rust-http-0.2) + ("rust-httparse" ,rust-httparse-1) + ("rust-log" ,rust-log-0.4) + ("rust-native-tls" ,rust-native-tls-0.2) + ("rust-rand" ,rust-rand-0.8) + ("rust-rustls" ,rust-rustls-0.20) + ("rust-rustls-native-certs" ,rust-rustls-native-certs-0.6) + ("rust-sha-1" ,rust-sha-1-0.9) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-url" ,rust-url-2) + ("rust-utf-8" ,rust-utf-8-0.7) + ("rust-webpki" ,rust-webpki-0.22) + ("rust-webpki-roots" ,rust-webpki-roots-0.22)) + #:cargo-development-inputs (("rust-criterion" ,rust-criterion-0.3) + ("rust-env-logger" ,rust-env-logger-0.9) + ("rust-input-buffer" ,rust-input-buffer-0.5) + ("rust-net2" ,rust-net2-0.2) + ("rust-rand" ,rust-rand-0.8)))))) + (define-public rust-tungstenite-0.11 (package (inherit rust-tungstenite-0.19) @@ -5551,8 +7281,62 @@ deserialization.") ("rust-http" ,rust-http-0.1) ("rust-mime" ,rust-mime-0.3)))))) +(define-public rust-warp-0.3 + (package + (name "rust-warp") + (version "0.3.6") + (source + (origin + (method url-fetch) + (uri (crate-uri "warp" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0sfimrpxkyka1mavfhg5wa4x977qs8vyxa510c627w9zw0i2xsf1")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs + (("rust-async-compression" ,rust-async-compression-0.3) + ("rust-bytes" ,rust-bytes-1) + ("rust-futures-channel" ,rust-futures-channel-0.3) + ("rust-futures-util" ,rust-futures-util-0.3) + ("rust-headers" ,rust-headers-0.3) + ("rust-http" ,rust-http-0.2) + ("rust-hyper" ,rust-hyper-0.14) + ("rust-log" ,rust-log-0.4) + ("rust-mime" ,rust-mime-0.3) + ("rust-mime-guess" ,rust-mime-guess-2) + ("rust-multer" ,rust-multer-2) + ("rust-percent-encoding" ,rust-percent-encoding-2) + ("rust-pin-project" ,rust-pin-project-1) + ("rust-rustls-pemfile" ,rust-rustls-pemfile-1) + ("rust-scoped-tls" ,rust-scoped-tls-1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-serde-urlencoded" ,rust-serde-urlencoded-0.7) + ("rust-tokio" ,rust-tokio-1) + ("rust-tokio-rustls" ,rust-tokio-rustls-0.24) + ("rust-tokio-stream" ,rust-tokio-stream-0.1) + ("rust-tokio-tungstenite" ,rust-tokio-tungstenite-0.20) + ("rust-tokio-util" ,rust-tokio-util-0.7) + ("rust-tower-service" ,rust-tower-service-0.3) + ("rust-tracing" ,rust-tracing-0.1)) + #:cargo-development-inputs + (("rust-handlebars" ,rust-handlebars-4) + ("rust-listenfd" ,rust-listenfd-1) + ("rust-pretty-env-logger" ,rust-pretty-env-logger-0.5) + ("rust-serde-derive" ,rust-serde-derive-1) + ("rust-tokio" ,rust-tokio-1) + ("rust-tokio-stream" ,rust-tokio-stream-0.1) + ("rust-tracing-log" ,rust-tracing-log-0.1) + ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3)))) + (home-page "https://github.com/seanmonstar/warp") + (synopsis "Serve the web at warp speeds") + (description "Warp is a composable, web server framework.") + (license license:expat))) + (define-public rust-warp-0.2 (package + (inherit rust-warp-0.3) (name "rust-warp") (version "0.2.5") (source @@ -5562,7 +7346,6 @@ deserialization.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "01wl8kv5hh1dd7gcwdrmn9xfs7jjsh9yc8xa06ph8yf9akgyc6zl")))) - (build-system cargo-build-system) (arguments `(#:skip-build? #t #:cargo-inputs @@ -5587,11 +7370,7 @@ deserialization.") ("rust-tower-service" ,rust-tower-service-0.3) ("rust-tracing" ,rust-tracing-0.1) ("rust-tracing-futures" ,rust-tracing-futures-0.2) - ("rust-urlencoding" ,rust-urlencoding-1)))) - (home-page "https://github.com/seanmonstar/warp") - (synopsis "Composable web server framework") - (description "Warp is a composable, web server framework.") - (license license:expat))) + ("rust-urlencoding" ,rust-urlencoding-1)))))) (define-public rust-web-view-0.7 (package @@ -5991,3 +7770,44 @@ with webpki.") implementation of webview, a tiny cross-platform library to render web-based GUIs as desktop applications.") (license license:expat))) + +(define-public rust-wiremock-0.5 + (package + (name "rust-wiremock") + (version "0.5.22") + (source + (origin + (method url-fetch) + (uri (crate-uri "wiremock" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1sf2adr5q3xqrj4sa89fmbr5vl3x51wb1cfp63fr1wrlmwzab8qk")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-assert-json-diff" ,rust-assert-json-diff-2) + ("rust-async-trait" ,rust-async-trait-0.1) + ("rust-base64" ,rust-base64-0.21) + ("rust-deadpool" ,rust-deadpool-0.9) + ("rust-futures" ,rust-futures-0.3) + ("rust-futures-timer" ,rust-futures-timer-3) + ("rust-http-types" ,rust-http-types-2) + ("rust-hyper" ,rust-hyper-0.14) + ("rust-log" ,rust-log-0.4) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-regex" ,rust-regex-1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-tokio" ,rust-tokio-1)) + #:cargo-development-inputs (("rust-actix-rt" ,rust-actix-rt-2) + ("rust-async-std" ,rust-async-std-1) + ("rust-isahc" ,rust-isahc-1) + ("rust-reqwest" ,rust-reqwest-0.11) + ("rust-surf" ,rust-surf-2) + ("rust-tokio" ,rust-tokio-1)))) + (native-inputs (list pkg-config)) + (inputs (list curl openssl zlib)) + (home-page "https://github.com/LukeMathWalker/wiremock-rs") + (synopsis "HTTP mocking to test Rust applications.") + (description "This package provides HTTP mocking to test Rust +applications.") + (license (list license:expat license:asl2.0)))) diff --git a/gnu/packages/crates-windows.scm b/gnu/packages/crates-windows.scm index e50c63f80f..ef91db0e96 100644 --- a/gnu/packages/crates-windows.scm +++ b/gnu/packages/crates-windows.scm @@ -101,18 +101,18 @@ (define-public rust-cargo-credential-wincred-0.4 (package (name "rust-cargo-credential-wincred") - (version "0.4.1") + (version "0.4.3") (source (origin (method url-fetch) (uri (crate-uri "cargo-credential-wincred" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1d3h1y0f42xv2sjvn2bmyib4pdimpxjmsi17npx0bd6wlsn568xs")))) + (base32 "0bb9yczmk3ral2r20v5c4jzf3l9qp0nmm11i20s0w5inprp9b228")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-cargo-credential" ,rust-cargo-credential-0.4) - ("rust-windows-sys" ,rust-windows-sys-0.48)))) + ("rust-windows-sys" ,rust-windows-sys-0.52)))) (home-page "https://github.com/rust-lang/cargo") (synopsis "Cargo credential process that stores tokens with Windows Credential Manager") @@ -138,30 +138,47 @@ Windows Credential Manager.") (("rust-cargo-credential" ,rust-cargo-credential-0.3) ("rust-windows-sys" ,rust-windows-sys-0.48)))))) -(define-public rust-clipboard-win-4 +(define-public rust-clipboard-win-5 (package (name "rust-clipboard-win") - (version "4.5.0") + (version "5.2.0") (source (origin (method url-fetch) (uri (crate-uri "clipboard-win" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0qh3rypkf1lazniq4nr04hxsck0d55rigb5sjvpvgnap4dyc54bi")))) + (base32 "15x28184cw6r8hx30farqvcir0kz151dfbfms4avl9q11rqa1y8j")))) (build-system cargo-build-system) (arguments `(#:tests? #f ; unresolved import `clipboard_win::raw` - #:cargo-inputs - (("rust-error-code" ,rust-error-code-2) - ("rust-str-buf" ,rust-str-buf-1) - ("rust-winapi" ,rust-winapi-0.3)))) + #:cargo-inputs (("rust-error-code" ,rust-error-code-3) + ("rust-windows-win" ,rust-windows-win-3)))) (home-page "https://github.com/DoumanAsh/clipboard-win") (synopsis "Simple way to interact with Windows clipboard") (description "This package provides simple way to interact with Windows clipboard.") (license license:boost1.0))) +(define-public rust-clipboard-win-4 + (package + (inherit rust-clipboard-win-5) + (name "rust-clipboard-win") + (version "4.5.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "clipboard-win" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0qh3rypkf1lazniq4nr04hxsck0d55rigb5sjvpvgnap4dyc54bi")))) + (arguments + `(#:tests? #f ; unresolved import `clipboard_win::raw` + #:cargo-inputs + (("rust-error-code" ,rust-error-code-2) + ("rust-str-buf" ,rust-str-buf-1) + ("rust-winapi" ,rust-winapi-0.3)))))) + (define-public rust-clipboard-win-3 (package (inherit rust-clipboard-win-4) @@ -719,14 +736,14 @@ See winapi for types and constants.") (define-public rust-win-crypto-ng-0.5 (package (name "rust-win-crypto-ng") - (version "0.5.0") + (version "0.5.1") (source (origin (method url-fetch) (uri (crate-uri "win-crypto-ng" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0faf5bd4d5kaf642yw91lh0n2bfwnz0l70bm85ysmj3dsj4hg9mf")))) + "14mv2wsvji8x7ds72zsjpz6hdq57y4r8r38xjyr4mrbib91zpawr")))) (build-system cargo-build-system) (arguments `(#:skip-build? #t ; Windows library @@ -941,17 +958,17 @@ color in a Windows console.") #:cargo-inputs (("rust-winapi" ,rust-winapi-0.3)))))) -(define-public rust-winreg-0.51 +(define-public rust-winreg-0.52 (package (name "rust-winreg") - (version "0.51.0") + (version "0.52.0") (source (origin (method url-fetch) (uri (crate-uri "winreg" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1z48nmaskwsiyyq9576sgf8ya3fvf1xg3kma8q7n8ml1jkvkszwk")) + (base32 "19gh9vp7mp1ab84kc3ag48nm9y7xgjhh3xa4vxss1gylk1rsaxx2")) (snippet #~(begin (use-modules (guix build utils)) (substitute* "Cargo.toml" @@ -965,8 +982,10 @@ color in a Windows console.") ("rust-serde" ,rust-serde-1) ("rust-windows-sys" ,rust-windows-sys-0.48)) #:cargo-development-inputs (("rust-rand" ,rust-rand-0.3) + ("rust-serde-transcode" ,rust-serde-transcode-1) ("rust-serde-bytes" ,rust-serde-bytes-0.11) ("rust-serde-derive" ,rust-serde-derive-1) + ("rust-serde-json" ,rust-serde-json-1) ("rust-tempfile" ,rust-tempfile-3)))) (home-page "https://github.com/gentoo90/winreg-rs") (synopsis "Rust bindings to the MS Windows Registry API") @@ -974,6 +993,35 @@ color in a Windows console.") "This package provides Rust bindings to MS Windows Registry API.") (license license:expat))) +(define-public rust-winreg-0.51 + (package + (inherit rust-winreg-0.52) + (name "rust-winreg") + (version "0.51.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "winreg" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1z48nmaskwsiyyq9576sgf8ya3fvf1xg3kma8q7n8ml1jkvkszwk")) + (snippet + #~(begin (use-modules (guix build utils)) + (substitute* "Cargo.toml" + (("\"~([[:digit:]]+(\\.[[:digit:]]+)*)" _ version) + (string-append "\"^" version))))))) + (build-system cargo-build-system) + (arguments + `(#:skip-build? #t ; OS not supported + #:cargo-inputs (("rust-cfg-if" ,rust-cfg-if-1) + ("rust-chrono" ,rust-chrono-0.4) + ("rust-serde" ,rust-serde-1) + ("rust-windows-sys" ,rust-windows-sys-0.48)) + #:cargo-development-inputs (("rust-rand" ,rust-rand-0.3) + ("rust-serde-bytes" ,rust-serde-bytes-0.11) + ("rust-serde-derive" ,rust-serde-derive-1) + ("rust-tempfile" ,rust-tempfile-3)))))) + (define-public rust-winreg-0.50 (package (inherit rust-winreg-0.51) @@ -1134,6 +1182,29 @@ color in a Windows console.") icons to windows executables and dynamic libraries.") (license license:expat))) +(define-public rust-winresource-0.1 + (package + (name "rust-winresource") + (version "0.1.17") + (source + (origin + (method url-fetch) + (uri (crate-uri "winresource" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0aakwh8llq2zvm7qihkrg7sz50hzccyl4x831j60g4psijpsmqkp")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; failed to resolve: could not find `um` in `winapi` + #:cargo-inputs (("rust-toml" ,rust-toml-0.7) + ("rust-version-check" ,rust-version-check-0.9)) + #:cargo-development-inputs (("rust-winapi" ,rust-winapi-0.3)))) + (home-page "https://github.com/BenjaminRi/winresource") + (synopsis "Create and set windows icons and metadata for executables") + (description "This package provides functions to create and set windows +icons and metadata for executables.") + (license license:expat))) + (define-public rust-winutil-0.1 (package (name "rust-winutil") @@ -1238,23 +1309,23 @@ for Rust.") "Contains function definitions for the Windows API library ws2_32.") (license license:expat))) -(define-public rust-windows-0.48 +(define-public rust-windows-0.52 (package (name "rust-windows") - (version "0.48.0") + (version "0.52.0") (source (origin (method url-fetch) (uri (crate-uri "windows" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "03vh89ilnxdxdh0n9np4ns4m10fvm93h3b0cc05ipg3qq1mqi1p6")))) + (base32 "1gnh210qjlprpd1szaq04rjm1zqgdm9j7l9absg0kawi2rwm72p4")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs - (("rust-windows-implement" ,rust-windows-implement-0.48) - ("rust-windows-interface" ,rust-windows-interface-0.48) - ("rust-windows-targets" ,rust-windows-targets-0.48)))) + `(#:cargo-inputs (("rust-windows-core" ,rust-windows-core-0.52) + ("rust-windows-implement" ,rust-windows-implement-0.52) + ("rust-windows-interface" ,rust-windows-interface-0.52) + ("rust-windows-targets" ,rust-windows-targets-0.52)))) (home-page "https://github.com/microsoft/windows-rs") (synopsis "Rust for Windows") (description "The windows crate lets you call any Windows API past, @@ -1263,6 +1334,24 @@ describing the API and right into your Rust package where you can call them as if they were just another Rust module.") (license (list license:expat license:asl2.0)))) +(define-public rust-windows-0.48 + (package + (inherit rust-windows-0.52) + (name "rust-windows") + (version "0.48.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "windows" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "03vh89ilnxdxdh0n9np4ns4m10fvm93h3b0cc05ipg3qq1mqi1p6")))) + (arguments + `(#:cargo-inputs + (("rust-windows-implement" ,rust-windows-implement-0.48) + ("rust-windows-interface" ,rust-windows-interface-0.48) + ("rust-windows-targets" ,rust-windows-targets-0.48)))))) + (define-public rust-windows-0.46 (package (inherit rust-windows-0.48) @@ -1387,16 +1476,16 @@ if they were just another Rust module.") (package (inherit rust-windows-aarch64-gnullvm-0.52) (name "rust-windows-aarch64-gnullvm") - (version "0.48.0") + (version "0.48.5") (source (origin (method url-fetch) (uri (crate-uri "windows_aarch64_gnullvm" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1g71yxi61c410pwzq05ld7si4p9hyx6lf5fkw21sinvr3cp5gbli")) + "1n05v7qblg1ci3i567inc7xrkmywczxrs1z3lj3rkkxw18py6f1b")) (snippet - '(delete-file "lib/libwindows.0.48.0.a")))) + '(delete-file "lib/libwindows.0.48.5.a")))) (arguments (list #:skip-build? #t)))) (define-public rust-windows-aarch64-gnullvm-0.42 @@ -1441,16 +1530,16 @@ crate.") (package (inherit rust-windows-aarch64-msvc-0.52) (name "rust-windows-aarch64-msvc") - (version "0.48.0") + (version "0.48.5") (source (origin (method url-fetch) (uri (crate-uri "windows_aarch64_msvc" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1wvwipchhywcjaw73h998vzachf668fpqccbhrxzrz5xszh2gvxj")) + "1g5l4ry968p73g6bg6jgyvy9lb8fyhcs54067yzxpcpkf44k2dfw")) (snippet - #~(delete-file "lib/windows.0.48.0.lib")))) + #~(delete-file "lib/windows.0.48.5.lib")))) (arguments (list #:skip-build? #t)))) (define-public rust-windows-aarch64-msvc-0.42 @@ -1567,6 +1656,25 @@ crate.") ("rust-syn" ,rust-syn-2) ("rust-windows-metadata" ,rust-windows-metadata-0.51)))))) +(define-public rust-windows-core-0.52 + (package + (name "rust-windows-core") + (version "0.52.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "windows-core" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1nc3qv7sy24x0nlnb32f7alzpd6f72l4p24vl65vydbyil669ark")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-windows-targets" ,rust-windows-targets-0.52)))) + (home-page "https://github.com/microsoft/windows-rs") + (synopsis "Rust for Windows") + (description "This package provides the core of Rust for Windows.") + (license (list license:expat license:asl2.0)))) + (define-public rust-windows-i686-gnu-0.52 (package (name "rust-windows-i686-gnu") @@ -1592,16 +1700,16 @@ crate.") (package (inherit rust-windows-i686-gnu-0.52) (name "rust-windows-i686-gnu") - (version "0.48.0") + (version "0.48.5") (source (origin (method url-fetch) (uri (crate-uri "windows_i686_gnu" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0hd2v9kp8fss0rzl83wzhw0s5z8q1b4875m6s1phv0yvlxi1jak2")) + "0gklnglwd9ilqx7ac3cn8hbhkraqisd0n83jxzf9837nvvkiand7")) (snippet - #~(delete-file "lib/libwindows.0.48.0.a")))) + #~(delete-file "lib/libwindows.0.48.5.a")))) (arguments (list #:skip-build? #t)))) (define-public rust-windows-i686-gnu-0.42 @@ -1703,15 +1811,15 @@ crate.") (package (inherit rust-windows-i686-msvc-0.52) (name "rust-windows-i686-msvc") - (version "0.48.0") + (version "0.48.5") (source (origin (method url-fetch) (uri (crate-uri "windows_i686_msvc" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "004fkyqv3if178xx9ksqc4qqv8sz8n72mpczsr2vy8ffckiwchj5")) + (base32 "01m4rik437dl9rdf0ndnm2syh10hizvq0dajdkv2fjqcywrw4mcg")) (snippet - #~(delete-file "lib/windows.0.48.0.lib")))) + #~(delete-file "lib/windows.0.48.5.lib")))) (arguments (list #:skip-build? #t)))) (define-public rust-windows-i686-msvc-0.42 @@ -1788,29 +1896,46 @@ crate.") (base32 "0r0z8s1wcdwd20azsdfilf2a6bz68xkavl990wy64hyc8f51bmai")))))) -(define-public rust-windows-implement-0.48 +(define-public rust-windows-implement-0.52 (package (name "rust-windows-implement") - (version "0.48.0") + (version "0.52.0") (source (origin (method url-fetch) (uri (crate-uri "windows-implement" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1764n853zd7bb0wn94i0qxfs6kdy7wrz7v9qhdn7x7hvk64fabjy")))) + (base32 "0il91jkdgnwl20gm8dwbjswsmiq7paif49dyk5kvhwv72wrqq5hj")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs - (("rust-proc-macro2" ,rust-proc-macro2-1) - ("rust-quote" ,rust-quote-1) - ("rust-syn" ,rust-syn-1)))) + `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-2)))) (home-page "https://github.com/microsoft/windows-rs") (synopsis "The implement macro for the windows crate") (description "This package provides the @code{implement} macro for the windows crate.") (license (list license:expat license:asl2.0)))) +(define-public rust-windows-implement-0.48 + (package + (inherit rust-windows-implement-0.52) + (name "rust-windows-implement") + (version "0.48.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "windows-implement" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1764n853zd7bb0wn94i0qxfs6kdy7wrz7v9qhdn7x7hvk64fabjy")))) + (arguments + `(#:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)))))) + (define-public rust-windows-implement-0.46 (package (inherit rust-windows-implement-0.48) @@ -1882,29 +2007,46 @@ windows crate.") (("rust-syn" ,rust-syn-1) ("rust-windows-tokens" ,rust-windows-tokens-0.32)))))) -(define-public rust-windows-interface-0.48 +(define-public rust-windows-interface-0.52 (package (name "rust-windows-interface") - (version "0.48.0") + (version "0.52.0") (source (origin (method url-fetch) (uri (crate-uri "windows-interface" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1iqcilw0hfyzwhk12xfmcy40r10406sgf4xmdansijlv1kr8vyz6")))) + (base32 "1la254wzd8qlbxplvb667z5mwdh9jngg1qyhxg6fx9wm00pc73cx")))) (build-system cargo-build-system) (arguments - `(#:cargo-inputs - (("rust-proc-macro2" ,rust-proc-macro2-1) - ("rust-quote" ,rust-quote-1) - ("rust-syn" ,rust-syn-1)))) + `(#:cargo-inputs (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-2)))) (home-page "https://github.com/microsoft/windows-rs") (synopsis "The interface macro for the windows crate") (description "This package provides the interface macro for the windows crate.") (license (list license:expat license:asl2.0)))) +(define-public rust-windows-interface-0.48 + (package + (inherit rust-windows-interface-0.52) + (name "rust-windows-interface") + (version "0.48.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "windows-interface" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1iqcilw0hfyzwhk12xfmcy40r10406sgf4xmdansijlv1kr8vyz6")))) + (arguments + `(#:cargo-inputs + (("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-syn" ,rust-syn-1)))))) + (define-public rust-windows-interface-0.46 (package (inherit rust-windows-interface-0.48) @@ -2175,14 +2317,14 @@ if they were just another Rust module.") (package (inherit rust-windows-targets-0.52) (name "rust-windows-targets") - (version "0.48.0") + (version "0.48.5") (source (origin (method url-fetch) (uri (crate-uri "windows-targets" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1mfzg94w0c8h4ya9sva7rra77f3iy1712af9b6bwg03wrpqbc7kv")))) + "034ljxqshifs1lan89xwpcy1hp0lhdh4b5n0d2z4fwjx2piacbws")))) (arguments `(#:cargo-inputs (("rust-windows-aarch64-gnullvm" ,rust-windows-aarch64-gnullvm-0.48) @@ -2248,6 +2390,28 @@ windows crate.") (base32 "1rrqbxjkyk6h6p6jjzbcxr0mhqbz0yfndd2s2dsgmbl75f4yy7gn")))))) +(define-public rust-windows-win-3 + (package + (name "rust-windows-win") + (version "3.0.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "windows-win" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1p7jbk3i7wj1i6w7chfp4rpbyd6ckgncp6h493wm4frbc8rkxqjq")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; unresolved import `windows_win::sys` + #:cargo-inputs (("rust-error-code" ,rust-error-code-3)) + #:cargo-development-inputs (("rust-clipboard-win" ,rust-clipboard-win-5)))) + (home-page "https://github.com/DoumanAsh/windows-win-rs") + (synopsis "Windows hacking library to find windows and access them") + (description + "Some windows hacking library with utilities to find windows and access them.") + (license license:boost1.0))) + (define-public rust-windows-x86-64-gnu-0.52 (package (name "rust-windows-x86-64-gnu") @@ -2273,16 +2437,16 @@ windows crate.") (package (inherit rust-windows-x86-64-gnu-0.52) (name "rust-windows-x86-64-gnu") - (version "0.48.0") + (version "0.48.5") (source (origin (method url-fetch) (uri (crate-uri "windows_x86_64_gnu" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1cblz5m6a8q6ha09bz4lz233dnq5sw2hpra06k9cna3n3xk8laya")) + "13kiqqcvz2vnyxzydjh73hwgigsdr2z1xpzx313kxll34nyhmm2k")) (snippet - #~(delete-file "lib/libwindows.0.48.0.a")))) + #~(delete-file "lib/libwindows.0.48.5.a")))) (arguments (list #:skip-build? #t)))) (define-public rust-windows-x86-64-gnu-0.42 @@ -2384,16 +2548,16 @@ windows crate.") (package (inherit rust-windows-x86-64-gnullvm-0.52) (name "rust-windows-x86-64-gnullvm") - (version "0.48.0") + (version "0.48.5") (source (origin (method url-fetch) (uri (crate-uri "windows_x86_64_gnullvm" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0lxryz3ysx0145bf3i38jkr7f9nxiym8p3syklp8f20yyk0xp5kq")) + "1k24810wfbgz8k48c2yknqjmiigmql6kk3knmddkv8k8g1v54yqb")) (snippet - '(delete-file "lib/libwindows.0.48.0.a")))) + '(delete-file "lib/libwindows.0.48.5.a")))) (arguments (list #:skip-build? #t)))) (define-public rust-windows-x86-64-gnullvm-0.42 @@ -2437,15 +2601,15 @@ windows crate.") (package (inherit rust-windows-x86-64-msvc-0.52) (name "rust-windows-x86-64-msvc") - (version "0.48.0") + (version "0.48.5") (source (origin (method url-fetch) (uri (crate-uri "windows_x86_64_msvc" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "12ipr1knzj2rwjygyllfi5mkd0ihnbi3r61gag5n2jgyk5bmyl8s")) + (base32 "0f4mdp895kkjh9zv8dxvn4pc10xr7839lf5pa9l0193i2pkgr57d")) (snippet - #~(delete-file "lib/windows.0.48.0.lib")))) + #~(delete-file "lib/windows.0.48.5.lib")))) (arguments (list #:skip-build? #t)))) (define-public rust-windows-x86-64-msvc-0.42 diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index 9c62689d18..d5d32d72fb 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -1554,14 +1554,14 @@ SHA-3, and BLAKE2.") (define-public rust-blake3-1 (package (name "rust-blake3") - (version "1.5.0") + (version "1.5.1") (source (origin (method url-fetch) (uri (crate-uri "blake3" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "11ysh12zcqq6xkjxh5cbrmnwzalprm3z552i5ff7wm5za9hz0c82")))) + (base32 "0lpgw3gl564wqwf98v9jsa29lp6nv7w7nn1cvw6w75s5cz9sdk1h")))) (build-system cargo-build-system) (arguments (list @@ -1573,7 +1573,7 @@ SHA-3, and BLAKE2.") ("rust-cfg-if" ,rust-cfg-if-1) ("rust-constant-time-eq" ,rust-constant-time-eq-0.3) ("rust-digest" ,rust-digest-0.10) - ("rust-memmap2" ,rust-memmap2-0.7) + ("rust-memmap2" ,rust-memmap2-0.9) ("rust-rayon" ,rust-rayon-1) ("rust-serde" ,rust-serde-1) ("rust-zeroize" ,rust-zeroize-1)) diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 61328fec39..96a59e8024 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -59,7 +59,7 @@ ;;; Copyright © 2022 muradm <mail@muradm.net> ;;; Copyright © 2022 Thomas Albers Raviola <thomas@thomaslabs.org> ;;; Copyright © 2021, 2022 jgart <jgart@dismail.de> -;;; Copyright © 2023 Felix Gruber <felgru@posteo.ne +;;; Copyright © 2023, 2024 Felix Gruber <felgru@posteo.net> ;;; Copyright © 2023 Munyoki Kilyungi <me@bonfacemunyoki.com> ;;; Copyright © 2023 Giacomo Leidi <goodoldpaul@autistici.org> ;;; Copyright © 2024 Troy Figiel <troy@troyfigiel.com> @@ -195,7 +195,7 @@ (define-public duckdb (package (name "duckdb") - (version "0.9.2") + (version "1.0.0") (source (origin (method git-fetch) @@ -205,7 +205,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "0dbsxyiz7c8sxflbfj87qv0b2s69zk802vsk5h00ra8w8fcbqlj0")) + "11yqgnf354g3fjj0rvsw8zzz915vf9i3jxmpchpwy09yzxd72cbg")) (modules '((guix build utils))) (snippet #~(begin @@ -614,6 +614,38 @@ the API, and provides features such as: @end itemize") (license license:bsd-3))) +(define-public python-adbc-driver-manager + (package + (name "python-adbc-driver-manager") + (version "1.1.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "adbc_driver_manager" version)) + (sha256 + (base32 "00i3zg6rbzdz767j9w22ajw8rxwbhkrmzwwlmx11q56cvnig0cm3")))) + (build-system pyproject-build-system) + (arguments + (list + ;; TODO: Pack arrow-adbc/c/driver/sqlite for tests. + #:tests? #f + #:build-backend "setuptools.build_meta")) + (propagated-inputs + (list python-typing-extensions)) + (native-inputs + (list python-cython-3 + python-pytest)) + (home-page "https://arrow.apache.org/adbc/") + (synopsis "Generic entrypoint for ADBC drivers in Python") + (description + "This package contains bindings for the ADBC Driver Manager, as well as a +@url{https://peps.python.org/pep-0249/,DBAPI 2.0/PEP 249-compatible} interface +on top. This can be used to load ADBC drivers at runtime and use them from +Python. Backend-specific packages like @code{adbc_driver_postgresql} wrap +this package in a more convenient interface, and should be preferred where +they exist.") + (license license:asl2.0))) + (define-public python-prisma (package (name "python-prisma") @@ -4618,7 +4650,7 @@ with integrated support for finding required rows quickly.") (define-public apache-arrow (package (name "apache-arrow") - (version "15.0.1") + (version "16.1.0") (source (origin (method git-fetch) @@ -4628,7 +4660,7 @@ with integrated support for finding required rows quickly.") (file-name (git-file-name name version)) (sha256 (base32 - "0zrcwsq9c976xncc1kg6lw24s5r3ag8vfzhmcnkvi5z2c9x4lvvc")))) + "1xl7apk7yaiv7cikpw5h846bsqb935cr3212b8bzhxqvkswxsm7f")))) (build-system cmake-build-system) (arguments (list @@ -5471,7 +5503,6 @@ compatible with SQLite using a graphical user interface.") (build-system go-build-system) (arguments (list - #:go go-1.21 #:install-source? #f #:import-path "github.com/lighttiger2505/sqls")) (native-inputs diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm index 612533b03d..d34b4fdf28 100644 --- a/gnu/packages/debug.scm +++ b/gnu/packages/debug.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2022 Matthew James Kraai <kraai@ftbfs.org> ;;; Copyright © 2023 Andy Tai <atai@atai.org> ;;; Copyright © 2023 Ricardo Wurmus <rekado@elephly.net> +;;; Copyright © 2024 Raven Hallsby <karl@hallsby.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -733,7 +734,7 @@ error reporting, better tracing, profiling, and a debugger.") (define-public rr (package (name "rr") - (version "5.7.0") + (version "5.8.0") (source (origin (method git-fetch) (uri (git-reference @@ -741,7 +742,7 @@ error reporting, better tracing, profiling, and a debugger.") (commit version))) (sha256 (base32 - "0y50gynh3bb28vsxspn0g71b0m1mmqdgs63pbq08sv7vps35nllz")) + "16w6vvvgww4i2f0jk5zlrr6606fj8kps21fnw0pshyw88l141rqn")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments diff --git a/gnu/packages/digest.scm b/gnu/packages/digest.scm index 481771804b..ae3bf8da75 100644 --- a/gnu/packages/digest.scm +++ b/gnu/packages/digest.scm @@ -69,8 +69,7 @@ Zig, V, and Nim programming language standard libraries.") (define-public xxhash (package (name "xxhash") - ;; XXX Remove the 'fix-man-page-links phase when updating. - (version "0.8.1") + (version "0.8.2") (source (origin (method git-fetch) @@ -79,7 +78,7 @@ Zig, V, and Nim programming language standard libraries.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1h6080lvcr5mpbvy4fhb4i7wvhpy72nrixk3djmpai4hxq41hsnr")))) + (base32 "1ljsmxcxfyxzxzk435qnjiyy441bgrxirn285lymyvv39nrwz1wj")))) (build-system gnu-build-system) (arguments (list #:make-flags @@ -93,12 +92,6 @@ Zig, V, and Nim programming language standard libraries.") (string-append "prefix=" (assoc-ref %outputs "out"))) #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'fix-man-page-links - ;; https://github.com/Cyan4973/xxHash/issues/647 - (lambda _ - (substitute* "Makefile" - (("ln -sf \\$\\(MAN\\)") - "ln -sf xxhsum.1")))) (delete 'configure)))) ; no configure script (home-page "https://cyan4973.github.io/xxHash/") (synopsis "Extremely fast hash algorithm") diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 9b161182e4..ee76647475 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -1308,7 +1308,6 @@ on your file system and offers to remove it. @command{rmlint} can find: (build-system go-build-system) (arguments (list - #:go go-1.18 #:install-source? #f #:import-path "github.com/gokcehan/lf")) (native-inputs diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm index 6a6437ff0c..eccf2e199e 100644 --- a/gnu/packages/display-managers.scm +++ b/gnu/packages/display-managers.scm @@ -81,55 +81,70 @@ "0mxrh0z9x4r4bli25g746n66adwnf3r42lzq0yssc50v9y7fc1a1")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules pkg-config qttools-5)) + (list extra-cmake-modules pkg-config qttools)) (inputs (list elogind glib libxcb libxkbcommon linux-pam - qtbase-5 - qtdeclarative-5 - ;; Some user-defined themes use QtQuick components internally. Adding - ;; QtQuick & co. here; they end up in QML2_IMPORT_PATH thanks to - ;; 'wrap-qt-program'. - qtgraphicaleffects - qtquickcontrols-5 - qtquickcontrols2-5 - qtsvg-5 + qtdeclarative + qtsvg shadow - wayland)) + wayland + qtwayland + qtbase + xsetroot)) (arguments - (list - #:configure-flags - #~(list - "-DENABLE_WAYLAND=ON" - "-DENABLE_PAM=ON" - ;; PAM is configured by pam service. - "-DINSTALL_PAM_CONFIGURATION=OFF" - ;; Both flags are required for elogind support. - "-DNO_SYSTEMD=ON" - "-DUSE_ELOGIND=ON" - "-DCONFIG_FILE=/etc/sddm.conf" - ;; Set path to /etc/login.defs. - ;; An alternative would be to use -DUID_MIN and -DUID_MAX. - (string-append "-DLOGIN_DEFS_PATH=" - #$(this-package-input "shadow") - "/etc/login.defs") - (string-append "-DCMAKE_CXX_FLAGS=-I" - #$(this-package-input - "qtdeclarative") "/include/qt5") - (string-append "-DQT_IMPORTS_DIR=" - #$output "/lib/qt5/qml") - (string-append "-DCMAKE_INSTALL_SYSCONFDIR=" - #$output "/etc")) - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'embed-loginctl-reference - (lambda _ - (substitute* "CMakeLists.txt" - (("/usr/bin/loginctl") - (which "loginctl")))))))) + (let* ((qtbase (this-package-input "qtbase")) + (qt6? (string= "6" (version-major (package-version qtbase))))) + (list + #:qtbase qtbase + #:configure-flags + #~(list + #$@(if qt6? + #~("-DBUILD_WITH_QT6=ON") + #~()) + "-DENABLE_WAYLAND=ON" + "-DENABLE_PAM=ON" + ;; PAM is configured by pam service. + "-DINSTALL_PAM_CONFIGURATION=OFF" + ;; Both flags are required for elogind support. + "-DNO_SYSTEMD=ON" + "-DUSE_ELOGIND=ON" + "-DCONFIG_FILE=/etc/sddm.conf" + ;; Set path to /etc/login.defs. + ;; An alternative would be to use -DUID_MIN and -DUID_MAX. + (string-append "-DLOGIN_DEFS_PATH=" + #$(this-package-input "shadow") + "/etc/login.defs") + (string-append + "-DCMAKE_CXX_FLAGS=-I" + #$(this-package-input "qtdeclarative") "/include/qt" #$(if qt6? "6" "5")) + (string-append "-DQT_IMPORTS_DIR=" + #$output "/lib/qt" #$(if qt6? "6" "5") "/qml") + (string-append "-DCMAKE_INSTALL_SYSCONFDIR=" + #$output "/etc")) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'embed-loginctl-reference + (lambda _ + (substitute* "CMakeLists.txt" + (("/usr/bin/loginctl") + (which "loginctl"))))) + (add-after 'unpack 'embed-xsetroot-reference + (lambda* (#:key inputs #:allow-other-keys) + (substitute* '("src/daemon/XorgDisplayServer.cpp" + "src/helper/xorguserhelper.cpp") + (("xsetroot") + (search-input-file inputs "/bin/xsetroot"))))) + #$@(if qt6? + #~((add-after 'unpack 'fix-QML_IMPORT_PATH + (lambda _ + (substitute* "src/daemon/Greeter.cpp" + (("QML2_IMPORT_PATH") + "QML_IMPORT_PATH"))))) + #~()))))) (synopsis "QML based X11 and Wayland display manager") (description "SDDM is a display manager for X11 and Wayland aiming to be fast, simple and beautiful. SDDM is themeable and puts no restrictions on the @@ -139,6 +154,19 @@ to create smooth, animated user interfaces.") ;; QML files are MIT licensed and images are CC BY 3.0. (license (list license:gpl2+ license:expat license:cc-by3.0)))) +(define-public sddm-qt5 + (package + (inherit sddm) + (name "sddm-qt5") + (native-inputs (modify-inputs (package-native-inputs sddm) + (replace "qttools" qttools-5))) + (inputs (modify-inputs (package-inputs sddm) + (replace "qtbase" qtbase-5) + (replace "qtsvg" qtsvg-5) + (replace "qtdeclarative" qtdeclarative-5) + (replace "qtwayland" qtwayland-5) + (append qtgraphicaleffects qtquickcontrols-5 qtquickcontrols2-5))))) + (define-public abstractdark-sddm-theme (let ((commit "e817d4b27981080cd3b398fe928619ffa16c52e7") (revision "0")) diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm index 12fbaf1d0c..2a047ba790 100644 --- a/gnu/packages/documentation.scm +++ b/gnu/packages/documentation.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2021, 2022 Marius Bakke <marius@gnu.org> ;;; Copyright © 2022 Maxim Cournoyer <maxim.counoyer@gmail.com> ;;; Copyright © 2023 Janneke Nieuwenhuizen <janneke@gnu.org> +;;; Copyright © 2024 Felix Gruber <felgru@posteo.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -410,52 +411,49 @@ the Net to search for documents which are not on the local system.") (license license:lgpl2.1+))) (define-public zeal - (let ((commit "1cfa7c637f745be9d98777f06b4f8dec90892bf2") - (revision "1")) - (package - (name "zeal") - (version (git-version "0.6.1" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/zealdocs/zeal") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1m7pp3cwc21x03718vhwfd9j2n8md3hv5dp10s234vcsd755s7a3")))) - (build-system qt-build-system) - (arguments - `(#:tests? #f ;no tests - #:phases - (modify-phases %standard-phases + (package + (name "zeal") + (version "0.7.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/zealdocs/zeal") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1yz9zz18rh1d67w40ib4pna70vqkwa9i9nyj423rjysv5rdj2pzp")))) + (build-system qt-build-system) + (arguments + (list + #:tests? #f ;no tests + #:phases + #~(modify-phases %standard-phases (add-after 'wrap 'wrap-qt-process-path - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin/zeal")) - (qt-process-path (string-append - (assoc-ref inputs "qtwebengine-5") - "/lib/qt5/libexec/QtWebEngineProcess"))) + (lambda* (#:key inputs #:allow-other-keys) + (let* ((bin (string-append #$output "/bin/zeal")) + (qt-process-path + (search-input-file inputs + "/lib/qt5/libexec/QtWebEngineProcess"))) (wrap-program bin - `("QTWEBENGINEPROCESS_PATH" = (,qt-process-path))) - #t)))))) - (native-inputs - (list extra-cmake-modules pkg-config)) - (inputs - `(("libarchive" ,libarchive) - ("sqlite" ,sqlite) - ("qtbase" ,qtbase-5) - ("qtdeclarative-5" ,qtdeclarative-5) - ("qtwebchannel-5" ,qtwebchannel-5) - ("qtwebengine-5" ,qtwebengine-5) - ("qtquickcontrols-5" ,qtquickcontrols-5) - ("qtx11extras" ,qtx11extras) - ("xcb-util-keyms" ,xcb-util-keysyms))) - (home-page "https://zealdocs.org/") - (synopsis "Offline documentation browser inspired by Dash") - (description "Zeal is a simple offline documentation browser + `("QTWEBENGINEPROCESS_PATH" = (,qt-process-path))))))))) + (native-inputs + (list extra-cmake-modules pkg-config)) + (inputs + (list libarchive + sqlite + qtbase-5 + qtdeclarative-5 + qtwebchannel-5 + qtwebengine-5 + qtquickcontrols-5 + qtx11extras + xcb-util-keysyms)) + (home-page "https://zealdocs.org/") + (synopsis "Offline documentation browser inspired by Dash") + (description "Zeal is a simple offline documentation browser inspired by Dash.") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public markdeep (package diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 4e809f1098..e2173067f4 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -114,7 +114,6 @@ (build-system go-build-system) (arguments (list - #:go go-1.18 #:install-source? #f #:import-path "github.com/xalanq/cf-tool" #:phases @@ -221,7 +220,7 @@ of categories with some of the activities available in that category. (define-public gcompris-qt (package (name "gcompris-qt") - (version "3.2") + (version "4.1") (source (origin (method url-fetch) @@ -229,7 +228,7 @@ of categories with some of the activities available in that category. "mirror://kde/stable/gcompris/qt/src/gcompris-qt-" version ".tar.xz")) (sha256 - (base32 "06yisr5qd2ri8qgpmlri0yic45fdfcdjn12anp17f6kvv83lk2js")))) + (base32 "1186ba3vn59fqdpgbvnvxqm8a3b7ginmw1sb3m5fr2az40xiqg9z")))) (build-system qt-build-system) (arguments `(#:phases @@ -617,7 +616,7 @@ a pen-tablet display and a beamer.") (define-public fet (package (name "fet") - (version "6.19.0") + (version "6.22.2") (source (origin (method url-fetch) @@ -626,7 +625,7 @@ a pen-tablet display and a beamer.") (list (string-append directory base) (string-append directory "old/" base)))) (sha256 - (base32 "1lrlwk9i2nc2d3ay5wajgv79nxkbl8hgv77aflgncikg4ma9yn55")))) + (base32 "1h0yhqcpw6nhzj30fjmwwj63i1nsvrmggm56yqs4v14mli0c08y0")))) (build-system gnu-build-system) (arguments (list @@ -678,34 +677,56 @@ hours.") language and very flexible regarding to new or unknown keyboard layouts.") (license license:gpl3+))) +(define-public kqtquickcharts + (package + (name "kqtquickcharts") + (version "24.05.2") + (source (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/release-service/" + version "/src/kqtquickcharts-" version ".tar.xz")) + (sha256 + (base32 + "0b0nqg77lzfw6accfsr4yg9fgq78skryd1qwkqf1zijhq4h65708")))) + (build-system qt-build-system) + (native-inputs (list extra-cmake-modules)) + (inputs (list qtdeclarative-5)) + (home-page "https://invent.kde.org/libraries/kqtquickcharts") + (synopsis "QtQuick plugin to render beautiful and interactive charts") + (description + "This package provides a QtQuick plugin to render beautiful and interactive +charts.") + (license (list license:lgpl2.0+ license:gpl2+)))) + (define-public ktouch (package (name "ktouch") - (version "21.12.2") + (version "24.05.2") (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/release-service/" - version "/src/ktouch-" version ".tar.xz")) - (sha256 - (base32 "1rq2n8395sb17rqd295axv2pbwzhqs8ikjqx5ryn4lv1713alabl")))) + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/release-service/" + version "/src/ktouch-" version ".tar.xz")) + (sha256 + (base32 "1636s1brigmd7wbmjlfgz2qlrrp592rrk9nylh9bi0j1nf3xa8c5")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules kdoctools pkg-config)) + (list extra-cmake-modules kdoctools-5 pkg-config)) (inputs - (list kcmutils - kcompletion - kconfig - kconfigwidgets - kcoreaddons - kdeclarative - ki18n - kiconthemes - kitemviews - ktextwidgets - kwidgetsaddons - kwindowsystem - kxmlgui + (list kcmutils-5 + kcompletion-5 + kconfig-5 + kconfigwidgets-5 + kcoreaddons-5 + kdeclarative-5 + ki18n-5 + kiconthemes-5 + kitemviews-5 + ktextwidgets-5 + kwidgetsaddons-5 + kwindowsystem-5 + kxmlgui-5 + kqtquickcharts libxcb libxkbfile qtbase-5 diff --git a/gnu/packages/elixir.scm b/gnu/packages/elixir.scm index e646fe7dd6..895ede25dd 100644 --- a/gnu/packages/elixir.scm +++ b/gnu/packages/elixir.scm @@ -41,7 +41,7 @@ (define-public elixir (package (name "elixir") - (version "1.17.1") + (version "1.17.2") (source (origin (method git-fetch) @@ -50,7 +50,7 @@ (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1nav5mv52l2sd37rhdnr4scqfnnnb04r481qabdqvfmfdvikxc3b")) + (base32 "063pfz6ljy22b4nyvk8pi8ggqb6nmzqcca08vnl3h9xgh1zzddpj")) (patches (search-patches "elixir-path-length.patch")))) (build-system gnu-build-system) (arguments diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 76cd340e5e..ecdb2acc63 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -290,9 +290,30 @@ #:use-module (srfi srfi-1) #:use-module (ice-9 match)) -;;; -;;; Emacs hacking. -;;; +(define-public emacs-0x0 + (let ((commit "04f95142b25d8bb701f239539176df6617dcd982") + (revision "0")) + (package + (name "emacs-0x0") + (version (git-version "1.0.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.sr.ht/~willvaughn/emacs-0x0") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0vj9vrfkgm7plp5mvq22fm9sln11j9763g3wd2w6c82rlsk6dhva")))) + (build-system emacs-build-system) + (home-page "https://git.sr.ht/~willvaughn/emacs-0x0") + (synopsis + "Integration with @url{https://0x0.st, 0x0.st} and self-hosted services +from Emacs") + (description + "Emacs 0x0 is a pastebin integration tool. It can upload the current +buffer, a file on your disk, or a string from the kill ring.") + (license license:gpl3+)))) (define-public emacs-ac-ispell (let ((commit "22bace7387e9012002a6a444922f75f9913077b0") @@ -1269,6 +1290,25 @@ out of the box.") is based off of Slim mode.") (license license:gpl3+))) +(define-public emacs-sed-mode + (package + (name "emacs-sed-mode") + (version "1.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://elpa.gnu.org/packages/sed-mode-" version + ".tar")) + (sha256 + (base32 "0zhga0xsffdcinh10di046n6wbx35gi1zknnqzgm9wvnm2iqxlyn")))) + (build-system emacs-build-system) + (home-page "https://elpa.gnu.org/packages/sed-mode.html") + (synopsis "Major mode to edit sed scripts") + (description + "The Sed major mode provides basic support for sed scripts. The +functionalities supported are font-locking and auto-indentation.") + (license license:gpl3+))) + (define-public emacs-spaceline-all-the-icons (package (name "emacs-spaceline-all-the-icons") @@ -1617,7 +1657,7 @@ libgit2 bindings for Emacs, intended to boost the performance of Magit.") (define-public emacs-llm (package (name "emacs-llm") - (version "0.16.1") + (version "0.17.0") (source (origin (method git-fetch) (uri (git-reference @@ -1625,11 +1665,11 @@ libgit2 bindings for Emacs, intended to boost the performance of Magit.") (commit version))) (file-name (git-file-name name version)) (sha256 (base32 - "0gxxs7ddkka836m3cq03s5qcay3sdsrfhanmgxybbc4byh6n0zh2")))) + "1sds3gb5accmpkajc60cbly2imkvvb7a3afi8qdb67p5vkk5xvc2")))) (build-system emacs-build-system) (propagated-inputs (list emacs-plz)) (home-page "https://github.com/ahyatt/llm") - (synopsis "Emacs library abstracting Large Language Model capabilities.") + (synopsis "Emacs library abstracting Large Language Model capabilities") (description "This package provides interfaces to abstract various @acronym{LLM, large language model}s out in the world. To respect user freedom, it will warn you @@ -1637,10 +1677,8 @@ before interacting with non-free LLMs.") (license license:gpl3+))) (define-public emacs-magit - ;; Use this unreleased commit to benefit from a recent improvements with - ;; regard to adding git trailers such as "Reviewed-by". - (let ((commit "dda332b2a41569f5fd8c0c2c3c2dab902d48ceb4") - (revision "7")) + (let ((commit "538cb2f90b5fdd04fcaacd537834f4f3c8c0720f") + (revision "8")) (package (name "emacs-magit") (version (git-version "3.3.0" revision commit)) @@ -1652,7 +1690,7 @@ before interacting with non-free LLMs.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "14vqfykfzddpfka7s3pmlh3yvbfd1rpjhab4g9dinz9hn48dwb06")))) + (base32 "1vzqy82ai8w0k283bij45k49pq4v3xy4yyy5gd24ba713y03327f")))) (build-system emacs-build-system) (arguments (list @@ -1944,6 +1982,28 @@ purpose finder.") files left by ArchLinux's pacman.") (license license:expat))) +(define-public emacs-palimpsest + (package + (name "emacs-palimpsest") + (version "1.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/danielsz/Palimpsest") + (commit "f474b3ad706373d9953abdc401d683a2a023d28e"))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0wzxl1zcbm3svspjpjzvx92is1k9sz7g0a99r8q066j2364la0zh")))) + (build-system emacs-build-system) + (home-page "https://github.com/danielsz/Palimpsest") + (synopsis "Remove text without permanently deleting it") + (description + "This minor mode for Emacs provides several strategies to remove text +without permanently deleting it. Namely, it can send selected test to the +bottom, or top, of the buffer, or to a trash file.") + (license license:gpl3+))) + (define-public emacs-minions (package (name "emacs-minions") @@ -2754,6 +2814,29 @@ different tools. It highlights errors and warnings inline in the buffer, and provides an optional IDE-like error list.") (license license:gpl3+))) ;+GFDLv1.3+ for the manual +(define-public emacs-flycheck-clj-kondo + (let ((commit "e38c67ba9db1ea1cbe1b61ab39b506c05efdcdbf") + (revision "1")) + (package + (name "emacs-flycheck-clj-kondo") + (version (git-version "0.0.4" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/borkdude/flycheck-clj-kondo") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1pxlb8axgmc8cw4id40z576kd041qb1irq8rkjn6xbda585ix58f")))) + (build-system emacs-build-system) + (propagated-inputs (list emacs-flycheck)) + (home-page "https://github.com/borkdude/flycheck-clj-kondo") + (synopsis "Add Clj-kondo linter to Flycheck") + (description + "This package integrates Clj-kondo with Emacs via Flycheck.") + (license license:gpl3+)))) + (define-public emacs-fb2-reader (let ((commit "9836db284749e0cef4c43c2cb5358c82ae9b8589")) ; version bump (package @@ -2864,6 +2947,38 @@ modes.") compile}.") (license license:gpl3+))) +(define-public emacs-flymake-perlcritic + (let ((commit "c11fee87370d8bd889a6c00d4f689fd5f08f2922") + (revision "0")) + (package + (name "emacs-flymake-perlcritic") + (version (git-version "1.0.3" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/flymake/emacs-flymake-perlcritic") + (commit commit))) + (sha256 + (base32 "1n2682ly8pw8sjj7bix4qjjxc5x396m6sxbv0k6vs93z4i1gy2qm")))) + (build-system emacs-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'set-command + (lambda* (#:key inputs #:allow-other-keys) + (emacs-substitute-variables "flymake-perlcritic.el" + ("flymake-perlcritic-command" + (search-input-file inputs "/bin/perlcritic")))))))) + (inputs (list perl-critic)) + (home-page "https://github.com/flymake/emacs-flymake-perlcritic") + (synopsis "Flymake handler for perlcritic") + (description + "Flymake Perlcritic adds support to Flymake for running Perl::Critic to +perform static analysis of Perl code.") + (license license:gpl3+)))) + (define-public emacs-flymake-popon (package (name "emacs-flymake-popon") @@ -3421,11 +3536,6 @@ or unexpected behavior inside an elisp configuration file (typically @file{init.el} or @file{.emacs}).") (license license:gpl3+)))) - -;;; -;;; Web browsing. -;;; - (define-public emacs-w3m ;; Emacs-w3m follows a "rolling release" model. (package @@ -3578,22 +3688,17 @@ to prevent advertisers from tracking you when you open URLs (or listen to podcasts) in Emacs.") (license (list license:gpl3+))))) - -;;; -;;; Multimedia. -;;; - (define emacs-emms-print-metadata (package (name "emacs-emms-print-metadata") - (version "20") + (version "20.1") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "emms-" version ".tar")) (sha256 - (base32 "0g61fgnslpaqvh6l872hjdwhnkzz79g1950wllx8hk9hr35nb2ag")))) + (base32 "0h0v31f1q7k45k8s9kncvim3a7np7fgjz4qg9v8gjc5ag01dzwkx")))) (build-system gnu-build-system) (arguments (list @@ -3730,6 +3835,41 @@ framework as the user interface, which integrates well with Vertico or Selectrum.") (license license:gpl3+))) +(define-public emacs-empv + (package + (name "emacs-empv") + (version "4.4.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/isamert/empv.el") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1x756842bwyzp8qqlkcnisbsvpb1i8dc7ajq32ra4l3zfk8vqbh1")))) + (build-system emacs-build-system) + (arguments + (list + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'set-default-binaries + (lambda* (#:key inputs #:allow-other-keys) + (emacs-substitute-variables "empv.el" + ("empv-fd-binary" (search-input-file inputs "/bin/fd")) + ("empv-mpv-binary" (search-input-file inputs "/bin/mpv")))))))) + (inputs (list fd mpv)) + (propagated-inputs (list emacs-compat emacs-consult emacs-s)) + (home-page "https://github.com/isamert/empv.el") + (synopsis + "Emacs multimedia player, media library manager, YouTube frontend") + (description + "This package is an Emacs multimedia player based on mpv. It offers +a comprehensive interface to mpv, including convenient features such as an +embedded radio manager, YouTube integration, and a local music and video +library manager.") + (license license:gpl3+))) + (define-public emacs-marginalia-emprise (package (name "emacs-marginalia-emprise") @@ -3777,11 +3917,6 @@ toggle custom-defined channels. An external media player like mpv or VLC is required.") (license license:gpl3+)))) - -;;; -;;; Miscellaneous. -;;; - (define-public emacs-ace-link (package (name "emacs-ace-link") @@ -4483,14 +4618,14 @@ as a library for other Emacs packages.") (define-public emacs-auctex (package (name "emacs-auctex") - (version "14.0.5") + (version "14.0.6") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "auctex-" version ".tar")) (sha256 - (base32 "0sycj6ad5jazmsxq37hsnvbywkpj66lrw3d3mxqr1wqkb67cdd3k")))) + (base32 "0cajri7x6770wjkrasa0p2s0dvcp74fpv1znac5wdfiwhvl1i9yr")))) (build-system emacs-build-system) ;; We use 'emacs' because AUCTeX requires dbus at compile time ;; ('emacs-minimal' does not provide dbus). @@ -5038,7 +5173,7 @@ that the binary uses instead of the actual binary contents.") (define-public emacs-ellama (package (name "emacs-ellama") - (version "0.9.11") + (version "0.11.12") (source (origin (method git-fetch) (uri (git-reference @@ -5046,9 +5181,9 @@ that the binary uses instead of the actual binary contents.") (commit version))) (file-name (git-file-name name version)) (sha256 (base32 - "18wxp7shzqhi7paqidv8j80fsiikvsckzm02cwhqy8fyyypv9pdc")))) + "16hhzb38qcrj7irf0h1h2yr8j02v0lkgxn89ysapabh9ppf6amx8")))) (build-system emacs-build-system) - (propagated-inputs (list emacs-dash emacs-llm emacs-spinner)) + (propagated-inputs (list emacs-compat emacs-dash emacs-llm emacs-spinner)) (home-page "https://github.com/s-kostyaev/ellama") (synopsis "Tool for interacting with LLMs") (description @@ -6764,7 +6899,7 @@ window.") (define-public emacs-git-link (package (name "emacs-git-link") - (version "0.9.1") + (version "0.9.2") (source (origin (method git-fetch) @@ -6773,7 +6908,7 @@ window.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1dxmzk4qrz69h097lwshfg4qavdp92an5212ndhjkpmkgvk1v0xl")))) + (base32 "1z7m7xl72x7as3d9l3zspac53kyij7hixpz1y2aq5gqpa7wzh87z")))) (build-system emacs-build-system) (arguments (list @@ -9107,26 +9242,20 @@ user.") (define-public emacs-subed (package (name "emacs-subed") - (version "1.2.11") + (version "1.2.14") (source (origin (method url-fetch) (uri (string-append "https://elpa.nongnu.org/nongnu/subed-" version ".tar")) (sha256 (base32 - "1dlh7vd8kc16wr9sqd3v7kkxfvqadi56pa52h35b86krndh4vazp")))) + "0kzb054radxq9hqviadmbr4cln39yp7yz4inq4ip52rd3qdm8vy4")))) (arguments (list #:tests? #t - #:test-command #~(list "make" "test-only") - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'compatibility-with-recent-buttercup - (lambda _ - (substitute* (find-files "tests/" "\\.el$") - (("\\(buttercup-minor-mode\\) -\\*-") - "(buttercup-minor-mode); lexical-binding: t -*-"))))))) + #:test-command #~(list "make" "test-only"))) (native-inputs (list emacs-buttercup)) + (inputs (list ffmpeg)) (build-system emacs-build-system) (home-page "https://elpa.nongnu.org/nongnu/subed.html") (synopsis "Major mode for editing subtitles") @@ -9410,7 +9539,7 @@ build jobs.") (define-public emacs-zmq (package (name "emacs-zmq") - (version "1.0.0") + (version "1.0.1") (source (origin (method git-fetch) @@ -9419,7 +9548,7 @@ build jobs.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1bg4c26f8n1jy6z9dr2c9fz79myy9lbb5z67797qp1cbx8k6p3n7")))) + (base32 "171cm487jbdqi73lk7vc9dsrzhxqic0yvy1vvxwk3b9qx1m2ab6v")))) (build-system emacs-build-system) (arguments (list @@ -9509,7 +9638,7 @@ correct movement and editing than you would otherwise have.") (define-public emacs-compat (package (name "emacs-compat") - (version "29.1.4.5") + (version "30.0.0.0") (source (origin (method git-fetch) (uri (git-reference @@ -9517,10 +9646,10 @@ correct movement and editing than you would otherwise have.") (commit version))) (sha256 (base32 - "1bq2nk052g5ydl6qgiiiflnamzn1lgikv6yc8ijfzwksg06wq959")))) + "0rw4j8caiyah7k6pml8bwxd9zs6q7mlqq3lvrm013vimw2js3d12")))) (build-system emacs-build-system) (home-page "https://elpa.gnu.org/packages/compat.html") - (synopsis "Emacs Lisp Compatibility Library") + (synopsis "Emacs Lisp compatibility library") (description "To allow for the usage of Emacs functions and macros that are defined in newer versions of Emacs, @code{compat.el} provides definitions that @@ -11090,7 +11219,7 @@ sgml/html integration, and indentation (working with sgml).") (define-public emacs-jinx (package (name "emacs-jinx") - (version "1.8") + (version "1.9") (source (origin (method git-fetch) @@ -11100,7 +11229,7 @@ sgml/html integration, and indentation (working with sgml).") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0sdirjxi5gsmc1vbmkj494s54zcmf6xrl6lrdqjnqmlbgq8517nw")))) + (base32 "17bygyvllmmnngmbp8grs5nrngiy61c2kbyxykf1hgvmj4hqwkv8")))) (build-system emacs-build-system) (arguments (list @@ -12380,6 +12509,26 @@ list of candidates.") completion using Consult.") (license license:gpl3+)))) +(define-public emacs-consult-denote + (package + (name "emacs-consult-denote") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://elpa.gnu.org/packages/consult-denote-" + version ".tar")) + (sha256 + (base32 "0yhf9fifas87rs4wdapszbpx1xqyq44izjq7vzpyvdlh5a5fhhx1")))) + (build-system emacs-build-system) + (propagated-inputs (list emacs-consult emacs-denote)) + (home-page "https://github.com/protesilaos/consult-denote") + (synopsis "Consult interface for Denote") + (description + "Consult Denote provides commands to interact with Emacs Denote using +a Completing Read interface.") + (license license:gpl3+))) + (define-public emacs-consult-dir (package (name "emacs-consult-dir") @@ -12772,7 +12921,7 @@ between symbols.") (define-public emacs-hl-todo (package (name "emacs-hl-todo") - (version "3.7.0") + (version "3.8.0") (source (origin (method git-fetch) (uri (git-reference @@ -12781,7 +12930,7 @@ between symbols.") (file-name (git-file-name name version)) (sha256 (base32 - "0am37ndwz8gkfs0d1va86q84yjdvvf0wag8fns3q87i5yhssi7vp")))) + "13qwh736srkrqiim1xpfkc5hjk1c77i9y6a71nv5iqaffykizkx0")))) (build-system emacs-build-system) (propagated-inputs (list emacs-compat)) @@ -14907,7 +15056,7 @@ with Elfeed.") (define-public emacs-elfeed-score (package (name "emacs-elfeed-score") - (version "1.2.7") + (version "1.2.8") (source (origin (method git-fetch) @@ -14916,7 +15065,7 @@ with Elfeed.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0s37m8566g396d8480jac07c89f2jjpg6p3hcwwmz89s27agp81q")))) + (base32 "0kmg3pciqihs8r5xja3pv48gzkn3vs6y6ij0dlmzmavymfp7hq5z")))) (build-system emacs-build-system) (arguments (list @@ -15025,6 +15174,28 @@ suggestion is taken.") customizable 256 color support to @code{term} and @code{ansi-term}.") (license license:gpl3+))) +(define-public emacs-centaur-tabs + (package + (name "emacs-centaur-tabs") + (version "3.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ema2159/centaur-tabs") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1z7b3s29xb0n25bfbbm1wrcap9dvig5zi5fcnvlyrl9si9565948")))) + (build-system emacs-build-system) + (propagated-inputs (list emacs-all-the-icons emacs-powerline)) + (home-page "https://github.com/ema2159/centaur-tabs") + (synopsis "Modern looking tabs plugin for Emacs") + (description + "This projects aims to become an aesthetic, functional and +efficient tabs plugin for Emacs with a lot of customization options.") + (license license:gpl3+))) + (define-public emacs-mocker (package (name "emacs-mocker") @@ -16077,7 +16248,7 @@ implementation.") (define-public emacs-cider (package (name "emacs-cider") - (version "1.15.0") + (version "1.15.1") (source (origin (method git-fetch) @@ -16086,7 +16257,7 @@ implementation.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1ih16wk9gd214kgz5s5azs4f26v5grvp9yacfzgidaxzrmzh83j8")))) + (base32 "0kzgkx6jcv2864c32qr9qvrxm66l6ncakcpw1j7vf24xi51cs9a1")))) (build-system emacs-build-system) (arguments '(#:include (cons* "^lein\\.sh$" "^clojure\\.sh$" %default-include) @@ -16483,7 +16654,7 @@ Lua programming language}.") (define-public emacs-ebuild-mode (package (name "emacs-ebuild-mode") - (version "1.71") + (version "1.72") (source (origin (method url-fetch) @@ -16492,7 +16663,7 @@ Lua programming language}.") "ebuild-mode-" version ".tar.xz")) (file-name (string-append name "-" version ".tar.xz")) (sha256 - (base32 "0gmzki027iyzzkvvsc9mq5njwwjvrys69awpfcq0rwbp11qn6jsd")))) + (base32 "1xzkb2i5azws6wrvbsxh5jpd2lvh0h1kxsm7dyzcf01a6w3qxks8")))) (build-system emacs-build-system) (arguments (list @@ -17171,7 +17342,7 @@ passive voice.") (define-public emacs-org (package (name "emacs-org") - (version "9.7.6") + (version "9.7.8") (source (origin (method git-fetch) @@ -17180,7 +17351,7 @@ passive voice.") (commit (string-append "release_" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0n3lnccd011njmy6srpjran2pi2frc3vq1cx11cqzd5p5961v7mj")))) + (base32 "0pkw47rkvyl3s2pisprh1l26c70n3n5b8vxw25mzkrz2nr94qn44")))) (build-system emacs-build-system) (arguments (list @@ -17794,7 +17965,7 @@ you to deal with multiple log levels.") (define-public emacs-denote (package (name "emacs-denote") - (version "2.3.5") + (version "3.0.7") (source (origin (method git-fetch) @@ -17803,7 +17974,7 @@ you to deal with multiple log levels.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "11rdmwdjaqzzrhnyidk02z2gd98qih8pnrc1vvbxvai50w8bdg2m")))) + (base32 "0dq0djv5baz6pab6vf5p52yywxz91smpb9fqlx1hyzl3cvgs8aml")))) (build-system emacs-build-system) (native-inputs (list texinfo)) (home-page "https://protesilaos.com/emacs/denote/") @@ -17983,6 +18154,31 @@ files in Emacs. Files of this type (e.g., @file{BUILD.gn} or @file{*.gni}) are common in Chromium-derived projects.") (license license:bsd-3))) +(define-public emacs-gnosis + (package + (name "emacs-gnosis") + (version "0.3.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.thanosapollo.org/gnosis") + (commit version))) + (sha256 + (base32 + "03ydknrzl5xcmn5n2ybyxqmjfrqrpk0h0p6cp9xnpmra6r87xqkd")) + (file-name (git-file-name name version)))) + (build-system emacs-build-system) + (propagated-inputs (list emacs-compat emacs-emacsql)) + (home-page "https://thanosapollo.org/projects/gnosis") + (synopsis "Spaced repetition system for GNU Emacs") + (description + "Gnosis is a spaced repetition system for note-taking and self-testing +where notes are formatted as Question/Answer/Explanation. Notes are reviewed +at spaced intervals based on the success or failure in recalling the answer to +each question.") + (license license:gpl3+))) + (define-public emacs-drag-stuff (package (name "emacs-drag-stuff") @@ -19791,14 +19987,14 @@ conflicts.") (define-public emacs-xelb (package (name "emacs-xelb") - (version "0.19") + (version "0.20") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/xelb-" version ".tar")) (sha256 (base32 - "1jgpb1ym7p2dfkk45zrv6w1jqgw66sb76jvjfjsqbrkx5605x2hk")))) + "12ikrnvik1n1fdc6ixx53d0z84v269wi463380k0i5zb6q8ncwpk")))) (build-system emacs-build-system) ;; The following functions and variables needed by emacs-xelb are ;; not included in emacs-minimal: @@ -19810,7 +20006,7 @@ conflicts.") #:emacs emacs #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'regenerate-el-files + (add-after 'expand-load-path 'regenerate-el-files (lambda* (#:key inputs native-inputs #:allow-other-keys) (substitute* "xelb-gen" (("/usr/bin/env") (which "env"))) @@ -19821,6 +20017,7 @@ conflicts.") (format #f "PROTO_PATH=~a/share/xcb" xcb-proto) (format #f "EMACS_BIN=~a -Q" emacs)))))))) (native-inputs (list xcb-proto)) + (propagated-inputs (list emacs-compat)) (home-page "https://github.com/ch11ng/xelb") (synopsis "X protocol Emacs Lisp binding") (description "@code{emacs-xelb} is a pure Emacs Lisp implementation of the @@ -19832,7 +20029,7 @@ It should enable you to implement low-level X11 applications.") (define-public emacs-exwm (package (name "emacs-exwm") - (version "0.30") + (version "0.31") (synopsis "Emacs X window manager") (source (origin @@ -19840,7 +20037,7 @@ It should enable you to implement low-level X11 applications.") (uri (string-append "https://elpa.gnu.org/packages/" "exwm-" version ".tar")) (sha256 - (base32 "1yscxs0knfb7wz7x6g9nixb6rpn5898q9dpsvk37ayda7nw75b2i")))) + (base32 "1i1k8w641n2fd6xifl92pvvq0s0b820lq76d1cyc7iyaqs44w9qq")))) (build-system emacs-build-system) (propagated-inputs (list emacs-xelb)) @@ -20272,8 +20469,8 @@ one if it fails.") (define-public emacs-jabber ;; No releases available. - (let ((commit "af0315e174fa6446d5c4dd3e6465d48912950e58") - (revision "0")) + (let ((commit "e766d84b81d5df6abc30fcbbb94f7c8640ea54e2") + (revision "1")) (package (name "emacs-jabber") (version (git-version "0.8.92" revision commit)) @@ -20285,7 +20482,7 @@ one if it fails.") (file-name (git-file-name name version)) (sha256 (base32 - "08q0hbm4pvp8sf261w1ihqa93sg8blfybfkhq7wrnvgs6kasgwvq")))) + "0b6msdyvhjr4v4j8hl6kmcjks88iq001w1fhjgfvg8ii9n77n6xn")))) (build-system emacs-build-system) (arguments (list @@ -20866,24 +21063,17 @@ as a modern file manager.") (define-public emacs-which-key (package (name "emacs-which-key") - (version "3.6.0") + (version "3.6.1") (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/justbur/emacs-which-key") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) + (method url-fetch) + (uri (string-append "https://elpa.gnu.org/packages/which-key-" version + ".tar")) (sha256 - (base32 "0ph5mrzz3r7x4dmy93v6affl4jznvic97a30mrs3kvhwyr2v4mby")))) + (base32 "0p1vl7dnd7nsvzgsff19px9yzcw4w07qb5sb8g9r8a8slgvf3vqh")))) (build-system emacs-build-system) - (arguments - `(#:tests? #t - #:test-command '("emacs" "--batch" - "-l" "which-key-tests.el" - "-f" "ert-run-tests-batch-and-exit"))) - (home-page "https://github.com/justbur/emacs-which-key") - (synopsis "Display available key bindings in popup") + (home-page "https://elpa.gnu.org/packages/which-key.html") + (synopsis "Display available keybindings in popup") (description "@code{emacs-which-key} is a minor mode for Emacs that displays the key bindings following your currently entered incomplete command (a prefix) in a @@ -22751,32 +22941,34 @@ the pipeline, featuring the support for running @code{emacsclient}.") (license license:gpl3+))) (define-public emacs-jupyter - (package - (name "emacs-jupyter") - (version "1.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/nnicandro/emacs-jupyter") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0rf8d83bzc05v0w7zpqwcd89cdvrxwzpyf55vmmzj5j755bgxvhs")))) - (build-system emacs-build-system) - (propagated-inputs - (list emacs-company ;optional - emacs-markdown-mode ;optional - emacs-simple-httpd - emacs-websocket - emacs-zmq)) - (home-page "https://github.com/nnicandro/emacs-jupyter") - (synopsis "Emacs interface to communicate with Jupyter kernels") - (description "This package provides an Emacs interface to communicate with + (let ((commit "f97f4b5d8c83e0b901020f835183dde8a2bf649e") + (revision "1")) + (package + (name "emacs-jupyter") + (version (git-version "1.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/nnicandro/emacs-jupyter") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0jmhh9ncnf4ai8rr2g474n6dv9m7v983s2w0smy0h7l07sp43klq")))) + (build-system emacs-build-system) + (propagated-inputs + (list emacs-company ;optional + emacs-markdown-mode ;optional + emacs-simple-httpd + emacs-websocket + emacs-zmq)) + (home-page "https://github.com/nnicandro/emacs-jupyter") + (synopsis "Emacs interface to communicate with Jupyter kernels") + (description "This package provides an Emacs interface to communicate with Jupyter kernels. It provides REPL and Org mode source code block frontends to Jupyter kernels and kernel interactions integrated with Emacs' built-in features.") - (license license:gpl3+))) + (license license:gpl3+)))) (define-public emacs-hcl-mode (package @@ -23246,8 +23438,8 @@ object has been freed.") (license license:unlicense))) (define-public emacs-emacsql - (let ((commit "29194a63ede3ee24c7457c2fde03b0f1320ca4b1") - (revision "1")) + (let ((commit "efddd69c5e69214dbbe921fbf90f938501414894") + (revision "2")) (package (name "emacs-emacsql") (version (git-version "3.1.1" revision commit)) @@ -23259,7 +23451,7 @@ object has been freed.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "14yj53xxqi3009bdj39k2fqwyc896yp2m7gdkgyv47wlkh1xwzxh")))) + (base32 "1abwc7kzlmk6z68glnya6kxffrrqrhgpwrpzqpjc1l179gg1i1rg")))) (build-system emacs-build-system) (arguments (list @@ -25680,7 +25872,7 @@ powerful Org contents.") (define-public emacs-org-re-reveal (package (name "emacs-org-re-reveal") - (version "3.28.2") + (version "3.29.1") (source (origin (method git-fetch) @@ -25689,7 +25881,7 @@ powerful Org contents.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1qbp198xg8pkd9zdvapq8bdsxilgqqync8m3r1csg8nz8lbpkk1b")))) + (base32 "1ql684l6jny3r3c7xa5m3mfgv89j0jpjan6a05gfay6m1pgsg9iy")))) (build-system emacs-build-system) (propagated-inputs (list emacs-htmlize emacs-org)) @@ -26400,6 +26592,27 @@ perform regression test for packages that provide font-lock rules.") It follows DrRacket concepts where applicable.") (license license:gpl2+)))) +(define-public emacs-ob-racket + (package + (name "emacs-ob-racket") + (version "1.3.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/hasu/emacs-ob-racket") + (commit version))) + (sha256 + (base32 + "0bqhxi1nikxwc0gyqsnxc7ya2s41vc06w39s24qz64kja8zqzzya")) + (file-name (git-file-name name version)))) + (build-system emacs-build-system) + (home-page "https://github.com/hasu/emacs-ob-racket") + (synopsis "Org Babel support for Racket") + (description + "This package adds spport for working with Racket code blocks with +Org Babel in Org mode.") + (license license:gpl3+))) + (define-public emacs-grep-context (let ((commit "5a4e3efdf775755c1bbefcfe4b461c1166d81d7d") (revision "1")) @@ -29210,10 +29423,10 @@ and comments.") (license license:gpl3+)))) (define-public emacs-yeetube - (let ((commit "c9721a295f4fd30a44e94b3424151fa8a14d22ae")) ;version bump + (let ((commit "5c0a3efd2fb5cc25a6a90741ad198e31fdb15640")) ;version bump (package (name "emacs-yeetube") - (version "2.1.6") + (version "2.1.7") (source (origin (method git-fetch) @@ -29222,7 +29435,7 @@ and comments.") (commit commit))) (sha256 (base32 - "0lrcs0n30h800sm6py4av44a3fcfgasmj223mnl76q34syyrgz6k")) + "0a3pm8cz6yl5s2xnbnjvdwm8mf5hyman419xl4fyyfgwy6vrxp70")) (file-name (git-file-name name version)))) (build-system emacs-build-system) (arguments @@ -29244,13 +29457,12 @@ and comments.") (inputs (list mpv torsocks yt-dlp)) (propagated-inputs (list emacs-compat)) (home-page "https://thanosapollo.org/projects/yeetube/") - (synopsis "Youtube and Invidious front-end for Emacs") + (synopsis "Youtube front-end for Emacs") (description - "This package offers an Emacs interface that allows you to search YouTube -or an Invidious instance for a specific query. The search results are shown -as links in an Org mode buffer. The videos can be opened to a user-defined + "This package provides the ability to scrape YouTube, with the results +displayed in a tabulated list format. The videos can be opened with a user-defined video player (by default @command{mpv}) or downloaded using @command{yt-dlp}. -This package also includes a @code{yt-dlp} front-end.") +This package also includes a minimal @code{yt-dlp} wrapper.") (license license:gpl3+)))) (define-public emacs-org-web-tools @@ -31144,6 +31356,14 @@ the standard @code{Dockerfile} file format.") (for-each (lambda (f) (install-file f ".")) (find-files "clients/" "\\.el$")))) + (add-after 'unpack 'enable-plists + (lambda _ + (substitute* "lsp-protocol.el" + ;; This is faster, and it's officially recommended, + ;; and it's required by emacs-lsp-booster. + ;; See also: + ;; <https://emacs-lsp.github.io/lsp-mode/page/performance/>. + (("\\(getenv \"LSP_USE_PLISTS\"\\)") "t")))) (add-before 'move-clients-libraries 'fix-patch-el-files ;; /bin/ksh is only used on macOS, which we don't support, so we ;; don't want to add it as input. @@ -31276,56 +31496,54 @@ in Docker environment.") (license license:gpl3+)))) (define-public emacs-dape - (let ((commit "51fad7df7473778fbc4bac703317de7f7713b307") - (revision "0")) - (package - (name "emacs-dape") - (version (git-version "0.12.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/svaante/dape") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1jics02b9fxjs0lykiv7z924z18id550mqhf6piqzv0sgan91pg2")))) - (build-system emacs-build-system) - (arguments - ;; FIXME python tests pass, JS tests require additional dependencies - ;; See https://lists.sr.ht/~abcdw/rde-devel/patches/51878 - (list #:tests? #f - #:test-command #~'("emacs" "--batch" "-l" "dape.el" - "-l" "dape-tests.el" - "-f" "ert-run-tests-batch-and-exit") - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'support-unwrapped-python - (lambda _ - (substitute* "dape.el" - (("command \"python\"") - "command \"python3\"")))) - (add-before 'check 'pre-check - (lambda* (#:key tests? inputs #:allow-other-keys) - (if tests? - (setenv - "PATH" - (string-append - (getenv "PATH") - ":" (dirname (search-input-file inputs "/bin/python3")) - ":" (dirname (search-input-file inputs "/bin/node")))) - (format #t "test suite not run~%"))))))) - (native-inputs (list node-lts python-minimal python-debugpy)) - (propagated-inputs (list emacs-jsonrpc)) - (home-page "https://github.com/svaante/dape") - (synopsis "Debug Adapter Protocol for Emacs") - (description - "Dape is a debug adapter client for Emacs. The debug adapter protocol, + (package + (name "emacs-dape") + (version "0.14.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/svaante/dape") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0227i5z9vkr2l9isrlssdwda844jvpcs4i9ryj0cwj6i60jbf1g3")))) + (build-system emacs-build-system) + (arguments + ;; FIXME python tests pass, JS tests require additional dependencies + ;; See https://lists.sr.ht/~abcdw/rde-devel/patches/51878 + (list #:tests? #f + #:test-command #~'("emacs" "--batch" "-l" "dape.el" + "-l" "dape-tests.el" + "-f" "ert-run-tests-batch-and-exit") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'support-unwrapped-python + (lambda _ + (substitute* "dape.el" + (("command \"python\"") + "command \"python3\"")))) + (add-before 'check 'pre-check + (lambda* (#:key tests? inputs #:allow-other-keys) + (if tests? + (setenv + "PATH" + (string-append + (getenv "PATH") + ":" (dirname (search-input-file inputs "/bin/python3")) + ":" (dirname (search-input-file inputs "/bin/node")))) + (format #t "test suite not run~%"))))))) + (native-inputs (list node-lts python-minimal python-debugpy)) + (propagated-inputs (list emacs-jsonrpc)) + (home-page "https://github.com/svaante/dape") + (synopsis "Debug Adapter Protocol for Emacs") + (description + "Dape is a debug adapter client for Emacs. The debug adapter protocol, much like its more well-known counterpart, the language server protocol, aims to establish a common API for programming tools. However, instead of functionalities such as code completions, it provides a standardized interface for debuggers.") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public emacs-dap-mode (package @@ -31796,7 +32014,7 @@ as Emacs Lisp.") (define-public emacs-transient (package (name "emacs-transient") - (version "0.7.2") + (version "0.7.3") (source (origin (method git-fetch) (uri (git-reference @@ -31805,7 +32023,7 @@ as Emacs Lisp.") (file-name (git-file-name name version)) (sha256 (base32 - "0fkgl374jxar2fhpjn4j67r7qc71xlg15r968lk1bny3aj3wf989")))) + "11yygh8h2ggslym3mly9dfgyml9srmcqkx1i9n190idv5a4gkjm7")))) (build-system emacs-build-system) (arguments `(#:tests? #f ;no test suite @@ -33032,10 +33250,64 @@ You might want to use this to globally set dir-local variables that apply to all of your projects, then override or add variables on a per-project basis.") (license license:gpl3+)))) +(define-public emacs-casual-avy + (package + (name "emacs-casual-avy") + (version "1.4.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/kickingvegas/casual-avy") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "120dnixi8if8v4s4xr0lilpbkikk93v5icf16fydsd143q8x81gg")))) + (build-system emacs-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ (chdir "lisp")))))) + (propagated-inputs (list emacs-casual-lib emacs-avy)) + (home-page "https://github.com/kickingvegas/casual-avy") + (synopsis "Transient-based porcelain for avy") + (description + "Casual Avy is an opinionated Transient-based porcelain for Emacs Avy.") + (license license:gpl3+))) + +(define-public emacs-casual-calc + (package + (name "emacs-casual-calc") + (version "1.10.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/kickingvegas/casual-calc") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0qdi6p3aybg0zwscf35l2dx51q7h4rz2g7r4xf7ml520dag7h5cw")))) + (build-system emacs-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ (chdir "lisp")))))) + (propagated-inputs (list emacs-casual-lib)) + (home-page "https://github.com/kickingvegas/casual-calc") + (synopsis "Transient-based porcelain for calc") + (description + "Casual Calc is an opinionated Transient-based porcelain for Emacs Calc.") + (license license:gpl3+))) + (define-public emacs-casual-dired (package (name "emacs-casual-dired") - (version "1.5.0") + (version "1.7.0") (source (origin (method git-fetch) @@ -33044,7 +33316,7 @@ all of your projects, then override or add variables on a per-project basis.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "17a2jgm01hjhq1nkx50bm5qakb0inf0x6vry57n33jq4ay1kfnfq")))) + (base32 "1lilb3gi8mmiiwdwr3xsy9pvm3nh5crzsvbh45dsk72wwgzjp94i")))) (build-system emacs-build-system) (arguments (list @@ -33054,15 +33326,42 @@ all of your projects, then override or add variables on a per-project basis.") (lambda _ (chdir "lisp")))))) (propagated-inputs (list emacs-casual-lib)) (home-page "https://github.com/kickingvegas/casual-dired") - (synopsis "Transient-based porcelain for dired") + (synopsis "Transient-based porcelain for Dired") (description "Casual Dired is an opinionated Transient-based porcelain for Emacs Dired.") (license license:gpl3+))) +(define-public emacs-casual-info + (package + (name "emacs-casual-info") + (version "1.3.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/kickingvegas/casual-info") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1a74njjp7vqvl4jnmrzqjpgpvgy66p11a47hx51mydyxayp4nwmr")))) + (build-system emacs-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ (chdir "lisp")))))) + (propagated-inputs (list emacs-casual-lib)) + (home-page "https://github.com/kickingvegas/casual-info") + (synopsis "Transient-based porcelain for info reader") + (description + "Casual Info is an opinionated Transient-based porcelain for Emacs Info reader.") + (license license:gpl3+))) + (define-public emacs-casual-lib (package (name "emacs-casual-lib") - (version "1.1.0") + (version "1.1.1") (source (origin (method git-fetch) (uri (git-reference @@ -33071,7 +33370,7 @@ all of your projects, then override or add variables on a per-project basis.") (file-name (git-file-name name version)) (sha256 (base32 - "0dn6jz8bbz17326g0jd1hvz80xxmbl7dwifb2nnw7nl6q6adbkmf")))) + "02pxnhp5idn6ypk5s5nl0df1s2pgmyy7g5p3hiyb52m972y1if35")))) (build-system emacs-build-system) (arguments (list #:tests? #t @@ -33093,7 +33392,7 @@ all of your projects, then override or add variables on a per-project basis.") (define-public emacs-calibredb (package (name "emacs-calibredb") - (version "2.12.0") + (version "2.13.0") (source (origin (method git-fetch) @@ -33102,7 +33401,7 @@ all of your projects, then override or add variables on a per-project basis.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1l30s3wv21mpybbxni5fziq2awai9k60i87s6fid56hg262r7jp0")))) + (base32 "1a4gyc3gcq18j29pw2i296d70nvx5fbzlw9fdmqwzncciqz5as6m")))) (build-system emacs-build-system) (arguments (list @@ -33389,14 +33688,14 @@ well as an option for visually flashing evaluated s-expressions.") (define-public emacs-tramp (package (name "emacs-tramp") - (version "2.6.3") + (version "2.7.1") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "tramp-" version ".tar")) (sha256 - (base32 "0z44mfpvn4qy2xc2fsiahw3xir140ljna8aq45dcb7qnmr044xjb")))) + (base32 "128k591219ffwbk1cifki0xx94rg6b7crh7gmhaiqfa6jylqhcg8")))) (build-system emacs-build-system) (arguments (list @@ -34426,7 +34725,7 @@ time.") (define-public emacs-mastodon (package (name "emacs-mastodon") - (version "1.0.23") + (version "1.0.24") (source (origin (method git-fetch) @@ -34435,7 +34734,7 @@ time.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1jknnp66fn6prk3b1xjjbml798vczfy7agf72pcvwrciljm9ij34")))) + (base32 "1365n7nswh7f6py82hkb5qd9fhl6mdr0jcpnbzsx0mc75vpyjvl8")))) (build-system emacs-build-system) (arguments (list @@ -34605,7 +34904,7 @@ contains a track position, playback will start at the specified position.") (define-public emacs-org-jira (package (name "emacs-org-jira") - (version "4.4.1") + (version "4.4.2") (source (origin (method git-fetch) @@ -34615,7 +34914,7 @@ contains a track position, playback will start at the specified position.") (file-name (git-file-name name version)) (sha256 (base32 - "1pkqyvziwp2573hnr8s41chsbm40564f76i3l8ynjr7955nccsms")))) + "1mg7p9y4d4m6b6qkjvdz6lqby3kvvdb7qcjqgkrf75rzv0rsn1h2")))) (build-system emacs-build-system) (arguments (list @@ -34861,43 +35160,45 @@ contrast and few colors.") (license license:gpl3+)))) (define-public emacs-doom-themes - (package - (name "emacs-doom-themes") - (version "2.3.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/hlissner/emacs-doom-themes") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "120pcas0l1m6w551qxfcl2fx0aysjqp91nn47zdxrr8rs01654wr")))) - (build-system emacs-build-system) - (native-inputs - (list emacs-ert-runner)) - (arguments - (list #:tests? #t - #:test-command #~(list "ert-runner") - #:modules '((guix build emacs-build-system) - (guix build utils) - (guix build emacs-utils) - (srfi srfi-1)) - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'move-themes - (lambda _ - ;; Move the source files to the top level, which is in the - ;; EMACSLOADPATH. - (for-each (lambda (f) - (rename-file f (basename f))) - (append - (find-files "./themes" ".*\\.el$") - (find-files "./extensions" ".*\\.el$")))))))) - (synopsis "Wide collection of color themes for Emacs") - (description "Emacs-doom-themes contains numerous popular color themes for + (let ((commit "188ab05eefe2bdc46b4464aadb4a52ff9cb42f7f") + (revision "0")) + (package + (name "emacs-doom-themes") + (version (git-version "2.3.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/doomemacs/themes") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "08avm5jfp887r2l77s6i0zn72wlv4kp47b2vzv3kywf3d0gkpgp8")))) + (build-system emacs-build-system) + (native-inputs + (list emacs-ert-runner)) + (arguments + (list #:tests? #t + #:test-command #~(list "ert-runner") + #:modules '((guix build emacs-build-system) + (guix build utils) + (guix build emacs-utils) + (srfi srfi-1)) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'move-themes + (lambda _ + ;; Move the source files to the top level, which is in the + ;; EMACSLOADPATH. + (for-each (lambda (f) + (rename-file f (basename f))) + (append + (find-files "./themes" ".*\\.el$") + (find-files "./extensions" ".*\\.el$")))))))) + (synopsis "Wide collection of color themes for Emacs") + (description "Emacs-doom-themes contains numerous popular color themes for Emacs that integrate with major modes like Org-mode.") - (home-page "https://github.com/hlissner/emacs-doom-themes") - (license license:expat))) + (home-page "https://github.com/doomemacs/themes") + (license license:expat)))) (define-public emacs-modus-themes (package @@ -35182,6 +35483,28 @@ when the command was not found in Eshell. The suggestions are found after the commands that bear resemblance to the input command.") (license license:gpl3+))) +(define-public emacs-eshell-git-prompt + (package + (name "emacs-eshell-git-prompt") + (version "0.1.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/xuchunyang/eshell-git-prompt") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "13b7nr0819pgzyvh0szi0zjyazgpxmsbqcz65cccyhh2pq48zb7j")))) + (build-system emacs-build-system) + (propagated-inputs (list emacs-dash)) + (home-page "https://github.com/xuchunyang/eshell-git-prompt") + (synopsis "Themes for Emacs Shell (Eshell) prompt") + (description + "This package provides a variety of themes for Emacs Shell (Eshell) +prompt.") + (license license:gpl3+))) + (define-public emacs-unfill (package (name "emacs-unfill") @@ -39694,6 +40017,32 @@ workspace diagnostics, symbols, and file symbols from @{emacs-lsp-mode} by leveraging @code{emacs-consult} APIs.") (license license:expat))) +(define-public emacs-consult-projectile + (let ((commit "400439c56d17bca7888f7d143d8a11f84900a406") + (revision "1")) + (package + (name "emacs-consult-projectile") + (version (git-version "0.7" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/OlMon/consult-projectile") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1abd2dw3zpiln9pd7l3j78wl3lwapcmf1ilijv3vin9g0wqb7hmn")))) + (build-system emacs-build-system) + (propagated-inputs (list emacs-consult emacs-projectile)) + (home-page "https://gitlab.com/OlMon/consult-projectile") + (synopsis "Consult integration for Projectile") + (description + "This package provides a multiview for displaying open buffers, files +and directories associated with a project. When no project is open in the +current buffer, it displays a list of known projects. One can then pick +a file from the selected project.") + (license license:gpl3+)))) + (define-public emacs-context-transient (package (name "emacs-context-transient") diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 6557180139..f1ea4fe061 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -100,15 +100,18 @@ (define-public emacs-minimal (package (name "emacs-minimal") - (version "29.3") - (replacement emacs-minimal/fixed) + (version "29.4") + ;; Note: When using (replacement …), ensure that comp-native-version-dir + ;; stays the same across grafts. + ;; Run `make check-system TESTS=emacs-native-comp' to ensure that grafts + ;; can meaningfully be applied. (source (origin (method url-fetch) (uri (string-append "mirror://gnu/emacs/emacs-" version ".tar.xz")) (sha256 (base32 - "1822swrk4ifmkd4h9l0h37zifcpa1w3sy3vsgyffsrp6mk9hak63")) + "0dd2mh6maa7dc5f49qdzj7bi4hda4wfm1cvvgq560djcz537k2ds")) (patches (search-patches "emacs-disable-jit-compilation.patch" "emacs-exec-path.patch" "emacs-fix-scheme-indent-function.patch" @@ -335,18 +338,6 @@ languages.") (files '("lib/tree-sitter"))))) (properties `((upstream-name . "emacs"))))) -(define emacs-minimal/fixed - (package - (inherit emacs-minimal) - (version "29.4") - (source - (origin (inherit (package-source emacs-minimal)) - (uri (string-append "mirror://gnu/emacs/emacs-" - version ".tar.xz")) - (sha256 - (base32 - "0dd2mh6maa7dc5f49qdzj7bi4hda4wfm1cvvgq560djcz537k2ds")))))) - (define-public emacs-no-x (package/inherit emacs-minimal (name "emacs-no-x") @@ -566,12 +557,12 @@ editor (with wide ints)" ) #~(cons "--with-wide-int" #$flags)))))) (define-public emacs-next-minimal - (let ((commit "170c6557922dad7e6e9bc0d6dadf6c080108fd42") - (revision "2")) + (let ((commit "4e22ef870c4b650f29c4441ac51b6a2ac506ea57") + (revision "1")) (package (inherit emacs-minimal) (name "emacs-next-minimal") - (version (git-version "30.0.50" revision commit)) + (version (git-version "30.0.60" revision commit)) (source (origin (method git-fetch) @@ -580,7 +571,7 @@ editor (with wide ints)" ) (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "04carva3b6h9fnlzazrsxsj41hcnjc26kxjij07l159azi40l6sk")) + (base32 "1zl9ffj3ph4msr1r4qw09x1wljpv2lbr7ypqd0p3q89m2qpvfn80")) (patches (search-patches "emacs-next-exec-path.patch" "emacs-fix-scheme-indent-function.patch" @@ -598,7 +589,28 @@ editor (with wide ints)" ) (string-drop (package-name emacs) (string-length "emacs")))))) (version version) - (source source))) + (source source) + (arguments + (substitute-keyword-arguments (package-arguments emacs) + ((#:phases phases) + #~(modify-phases #$phases + (replace 'validate-comp-integrity + (lambda* (#:key outputs #:allow-other-keys) + #$(cond + ((%current-target-system) + #~(display + "Cannot validate native compilation on cross builds.\n")) + ((member (%current-system) '("armhf-linux" "i686-linux")) + #~(display "Integrity test is broken on 32 bit systems.\n")) + (else + #~(invoke + (string-append (assoc-ref outputs "out") "/bin/emacs") + "--batch" + "--load" + #$(local-file + (search-auxiliary-file + "emacs/comp-integrity-next.el")) + "-f" "ert-run-tests-batch-and-exit"))))))))))) (define-public emacs-next (emacs->emacs-next emacs)) (define-public emacs-next-pgtk (emacs->emacs-next emacs-pgtk)) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 4471de9040..d2e488864e 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -61,11 +61,13 @@ #:use-module (gnu packages boost) #:use-module (gnu packages cdrom) #:use-module (gnu packages check) + #:use-module (gnu packages cmake) #:use-module (gnu packages compression) #:use-module (gnu packages containers) #:use-module (gnu packages cross-base) #:use-module (gnu packages curl) #:use-module (gnu packages digest) + #:use-module (gnu packages engineering) #:use-module (gnu packages elf) #:use-module (gnu packages flex) #:use-module (gnu packages fltk) @@ -113,6 +115,7 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system meson) #:use-module (guix build-system python) + #:use-module (guix build-system pyproject) #:use-module (guix build-system qt)) (define-public vice @@ -674,30 +677,30 @@ V2.") (define-public mednafen (package (name "mednafen") - (version "1.29.0") + (version "1.32.1") (source (origin (method url-fetch) (uri (string-append "https://mednafen.github.io/releases/files/" "mednafen-" version ".tar.xz")) (sha256 - (base32 "0binkxnki8w8jgiyf3xr9503m5cynlf5vylb087vxybp53qbqgys")))) + (base32 "0ciqr3dlf1b3r8jncy9k9cihiclai8v28r9pb1vsw4k2nr5bjzny")))) (build-system gnu-build-system) (arguments - `(#:configure-flags - (list - ;; "--with-external-mpcdec" - "--with-external-lzo"))) + (list #:configure-flags + #~(list + ;; "--with-external-mpcdec" + "--with-external-lzo"))) (native-inputs (list pkg-config)) (inputs - `(("alsa" ,alsa-lib) - ("flac" ,flac) - ;; ("libmpcdec" ,libmpcdec) FIXME: not recognized. - ("libsndfile" ,libsndfile) - ("lzo" ,lzo) - ("sdl2" ,sdl2) - ("zlib" ,zlib))) + (list alsa-lib + flac + ;; libmpcdec ;FIXME: not recognized. + libsndfile + lzo + sdl2 + zlib)) (home-page "https://mednafen.github.io/") (synopsis "Multi-system emulator utilizing OpenGL and SDL") (description @@ -2296,106 +2299,24 @@ graphic filters. Some of its features include: (license license:gpl2+) (supported-systems (list "x86_64-linux")))) -;; python-pwntools requires a -rc release of unicorn (define-public unicorn - (let ((unless-x86 - (lambda (code) - (if (member (%current-system) '("x86_64-linux" "i686-linux")) - '() - code)))) - (package - (name "unicorn") - (version "1.0.2-rc4") - ;; NOTE: unicorn ships a bundled QEMU, but with a lot of custom modifications. - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/unicorn-engine/unicorn") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "17nyccgk7hpc4hab24yn57f1xnmr7kq4px98zbp2bkwcrxny8gwy")))) - (outputs '("out" "python")) - ;; The main library is not written in Python, but the build process has - ;; little in common with any defined build system, so we might as well - ;; build on top of python-build-system and make use of all - ;; the Python-specific phases that can be reused. - (build-system python-build-system) - (arguments - `(#:modules ((srfi srfi-26) - (guix build python-build-system) - (guix build utils)) - #:phases - (modify-phases %standard-phases - (add-before 'build 'build-library - (lambda* (#:key inputs #:allow-other-keys) - (invoke "make" - "-j" (number->string (parallel-job-count)) - "UNICORN_STATIC=no" - "CC=gcc"))) - (add-after 'build-library 'install-library - (lambda* (#:key outputs #:allow-other-keys) - (invoke "make" "install" - "UNICORN_STATIC=no" - (string-append - "PREFIX=" - (assoc-ref outputs "out"))))) - (add-before 'build 'prepare-bindings - (lambda* (#:key outputs #:allow-other-keys) - (chdir "bindings/python") - ;; Set this environment variable so that the Python bindings - ;; don't build their own copy of the shared object, but use - ;; a dummy value such that the bindings test suite uses the - ;; same mechanism for loading the library as any other user. - (setenv "LIBUNICORN_PATH" "1") - (substitute* "unicorn/unicorn.py" - (("_path_list = \\[.*") - (string-append - "_path_list = [\"" - (assoc-ref outputs "out") - ;; eat the rest of the list - "/lib\"] + 0*["))) - #t)) - (add-before 'check 'check-library - (lambda* (#:key outputs #:allow-other-keys) - (for-each - (lambda (suite) - (with-directory-excursion - (string-append "../../tests/" suite) - (invoke "make" "test" "CC=gcc" - ,@(unless-x86 - '("AS=i686-unknown-linux-gnu-as" - "OBJCOPY=i686-unknown-linux-gnu-objcopy"))))) - '("unit" "regress")) - #t)) - (add-after 'install 'install-samples - (lambda* (#:key outputs #:allow-other-keys) - (let* ((python-samples (find-files "." "sample_.*")) - (c-samples (find-files "../../samples" ".*\\.c")) - (python-docdir - (string-append (assoc-ref outputs "python") - "/share/doc/unicorn/samples")) - (c-docdir - (string-append (assoc-ref outputs "out") - "/share/doc/unicorn/samples"))) - (for-each (cut install-file <> c-docdir) c-samples) - (for-each (cut install-file <> python-docdir) python-samples) - #t)))))) - (native-inputs - ;; NOTE: cross-binutils needs to be wrapped with unless-x86, as otherwise - ;; the linker provided by the package will be used, circumventing the ld-wrapper. - `(,@(unless-x86 - `(("assembler-for-tests" ,(cross-binutils "i686-unknown-linux-gnu")))) - ("cmocka" ,cmocka) - ("hexdump-for-tests" ,util-linux))) - (home-page "https://www.unicorn-engine.org") - (synopsis "Unicorn CPU emulator framework") - (description - "Unicorn is a lightweight, multi-platform, multi-architecture CPU emulator -framework based on QEMU.") - (license license:gpl2+)))) + (package + (name "unicorn") + (version "2.0.1.post1") + (source + (origin + (method url-fetch) + (uri (pypi-uri name version)) + (sha256 + (base32 "0mlfs8qfi0clyncfkbxp6in0cpl747510i6bqymwid43xcirbikz")))) + (build-system pyproject-build-system) + (native-inputs (list cmake pkg-config)) + (home-page "https://www.unicorn-engine.org") + (synopsis "Generic CPU emulator framework") + (description + "Uniforn is a lightweight, multi-platform, multi-architecture CPU +emulator framework based on QEMU.") + (license license:gpl2+))) (define-public ppsspp (package @@ -2702,6 +2623,55 @@ cache visualization. Developed at FEE CTU for computer architecture classes.") stack-machine, written in ANSI C. Graphical output is implemented using SDL2.") (license license:expat)))) +(define-public python-keystone-engine + (package + (name "python-keystone-engine") + (version "0.9.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "keystone-engine" version)) + (sha256 + (base32 "1xahdr6bh3dw5swrc2r8kqa8ljhqlb7k2kxv5mrw5rhcmcnzcyig")))) + (native-inputs (list cmake)) + (build-system pyproject-build-system) + (home-page "https://www.keystone-engine.org") + (synopsis + "Lightweight multi-platform, multi-architecture assembler framework") + (description + "Keystone is a lightweight multi-platform, multi-architecture +assembler framework. It supports a wide-range of different architectures +and offers an intuitive architecture-neutral API for interacting with +assembly for these architectures.") + (license license:gpl2))) + +(define-public python-archinfo + (package + (name "python-archinfo") + ;; Must be the same version as python-angr. + (version "9.2.46") + (source + (origin + (method url-fetch) + (uri (pypi-uri "archinfo" version)) + (sha256 + (base32 "037xfq3wcf8ngayxz9623l4646m780v2102mfbygpzbkkjha1966")))) + (build-system pyproject-build-system) + (propagated-inputs (list python-capstone python-keystone-engine)) + (arguments + `(#:phases (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (with-directory-excursion "tests" + (invoke "python" "-m" "unittest")))))))) + (home-page "https://github.com/angr/archinfo") + (synopsis "Extract architecture-specific information from binaries") + (description + "Collection of classes that contain architecture-specific information +information. Useful for cross-architecture tools (such as @code{python-pyvex}).") + (license license:bsd-2))) + (define-public emu8051 (let ((commit "5dc681275151c4a5d7b85ec9ff4ceb1b25abd5a8") (revision "1")) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 0f290de7eb..4e465ddb7d 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -819,7 +819,7 @@ required for Fritzing app.") (native-inputs (list pkg-config qttools-5)) (inputs - (list kcoreaddons kwidgetsaddons qtbase-5 qtsvg-5 sqlite)) + (list kcoreaddons-5 kwidgetsaddons-5 qtbase-5 qtsvg-5 sqlite)) (home-page "https://qelectrotech.org/") (synopsis "CAD/CAE editor focusing on schematics drawing features") (description "QElectroTech, or QET in short, is a desktop application to @@ -1787,6 +1787,7 @@ analyzer (FFT) and frequency sweep plot.") (version "5.0.1") (source (origin (method git-fetch) + (patches (search-patches "capstone-fix-python-constants.patch")) (uri (git-reference (url "https://github.com/capstone-engine/capstone") (commit version))) @@ -1798,7 +1799,7 @@ analyzer (FFT) and frequency sweep plot.") (arguments `(#:tests? #f #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")) - "CC=gcc") + (string-append "CC=" ,(cc-for-target))) #:phases (modify-phases %standard-phases (delete 'configure) ; no configure script @@ -2626,6 +2627,65 @@ specification can be downloaded at @url{http://3mf.io/specification/}.") measurement devices and test equipment via GPIB, RS232, Ethernet or USB.") (license license:expat))) +(define-public python-pandapower + (package + (name "python-pandapower") + (version "2.14.9") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pandapower" version ".zip")) + (sha256 + (base32 "0c5vgiq795kd5q4wcy2x7s3l7x9xdj2nqyfx188dmhgqckrym161")))) + (build-system pyproject-build-system) + (native-inputs (list python-pyproj python-pytest unzip)) + (propagated-inputs (list python-deepdiff + python-geojson + python-networkx + python-numpy + python-packaging + python-pandas + python-scipy + python-tqdm + python-typing-extensions)) + (home-page "https://www.pandapower.org/") + (synopsis "Power system modelling and analysis") + (description "@code{pandapower} is an easy to use network calculation +program aimed to automate the analysis and optimization of power systems. +It uses the data analysis library @code{pandas} and is compatible with the +commonly used @code{MATPOWER} / @code{PYPOWER} case format. @code{pandapower} +allows using different solvers including an improved Newton-Raphson power flow +implementation, all @code{PYPOWER} solvers, the C++ library solvers for fast +steady-state distribution power system analysis of @code{PowerGridModel}, the +Newton-Raphson power flow solvers in the C++ library lightsim2grid, and the +@code{PowerModels.jl} library.") + (license license:bsd-3))) + +(define-public python-pandapipes + (package + (name "python-pandapipes") + (version "0.10.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pandapipes" version ".zip")) + (sha256 + (base32 "06yqqd25hxa6q49qcbpy0njwxkqzfhbff4frrrxd84391njgvdhq")))) + (build-system pyproject-build-system) + (native-inputs (list python-nbmake + python-pytest + python-pytest-xdist + unzip)) + (propagated-inputs (list python-matplotlib + python-pandapower + python-shapely)) + (home-page "http://www.pandapipes.org") + (synopsis "Simulation of multi energy grids") + (description + "This package provides a pipeflow calculation tool that complements +@code{pandapower} in the simulation of multi energy grids.") + (license license:bsd-3))) + (define-public python-scikit-rf (package (name "python-scikit-rf") @@ -2663,6 +2723,41 @@ measurement devices and test equipment via GPIB, RS232, Ethernet or USB.") Microwave engineering.") (license license:bsd-3))) +(define-public python-lcapy + (package + (name "python-lcapy") + (version "1.23") + (source + (origin + (method url-fetch) + (uri (pypi-uri "lcapy" version)) + (sha256 + (base32 "13swd2nd2s20hixy4as924sr223flcvcy9zw3qlzsrcvhppzb84n")))) + (build-system pyproject-build-system) + (arguments + (list + ;; This test fails by FileNotFoundError (a schematic file), possibly + ;; because it's not included in PyPI. + #:test-flags #~(list "-k" "not test_circuitgraph"))) + (propagated-inputs (list python-ipython + python-matplotlib + python-networkx + python-numpy + python-property-cached + python-scipy + python-sympy + python-wheel)) + (native-inputs (list python-pytest)) + (home-page "https://github.com/mph-/lcapy") + (synopsis "Symbolic linear circuit analysis") + (description "Lcapy is a Python package for linear circuit analysis. It +uses SymPy for symbolic mathematics. + +Lcapy can symbolically analyse circuits described with netlists or by +series/parallel combinations of components. It can also manipulate +ontinuous-time and discret-time expressions.") + (license license:lgpl2.1+))) + (define-public openscad (package (name "openscad") diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm index aba0be21e7..c45913f09c 100644 --- a/gnu/packages/fcitx5.scm +++ b/gnu/packages/fcitx5.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2022 Dominic Martinez <dom@dominicm.dev> ;;; Copyright © 2022 dan <i@dan.games> +;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -317,18 +318,22 @@ IM module for GTK+3 applications. (base32 "0jdisavns5k718vrnh2lmmyrnys101szbw107d200nfl4i26wllj")))) (build-system cmake-build-system) (arguments - `(#:configure-flags - (list (string-append "-DCMAKE_INSTALL_QT5PLUGINDIR=" - %output "/lib/qt5/plugins") - "-DENABLE_QT4=Off"))) - (inputs - `(("fcitx5" ,fcitx5) - ("libxcb" ,libxcb) - ("libxkbcommon" ,libxkbcommon) - ("qtbase" ,qtbase-5) - ("gettext" ,gettext-minimal))) - (native-inputs - (list extra-cmake-modules)) + (list #:configure-flags + #~(list (string-append "-DCMAKE_INSTALL_QT5PLUGINDIR=" + #$output "/lib/qt5/plugins") + (string-append "-DCMAKE_INSTALL_QT6PLUGINDIR=" + #$output "/lib/qt6/plugins") + "-DENABLE_QT4=Off" + "-DENABLE_QT6=ON"))) + (inputs (list fcitx5 + libxcb + libxkbcommon + qtbase-5 + qtbase + qtwayland + wayland + gettext-minimal)) + (native-inputs (list extra-cmake-modules)) (home-page "https://github.com/fcitx/fcitx5-qt") (synopsis "Qt library and IM module for Fcitx 5") (description "Fcitx5-qt provides Qt library for development and IM module @@ -439,19 +444,20 @@ including input methods previous bundled inside Fcitx 4: (sha256 (base32 "1pnwrj6kgha91djfvd2439nbhrmjargpw8ashhb91y5h3cdz7vhz")))) (build-system cmake-build-system) + (arguments (list #:configure-flags #~(list "-DUSE_QT6=ON"))) (inputs (list fcitx5 fcitx5-qt - qtbase-5 - qtx11extras - qtdeclarative-5 - qtquickcontrols2-5 + qtbase + qtdeclarative + ksvg + kcmutils ki18n kpackage kdeclarative kiconthemes kcoreaddons - plasma-framework + libplasma kitemviews kwidgetsaddons kwindowsystem diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index fa7da35898..707937b78c 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -1956,7 +1956,6 @@ memory-efficient.") (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/oniony/TMSU" #:unpack-path "github.com/oniony/TMSU" #:install-source? #f diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 82c746a526..7f230f2806 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -11,7 +11,7 @@ ;;; Copyright © 2018 Adriano Peluso <catonano@gmail.com> ;;; Copyright © 2018-2022 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net> -;;; Copyright © 2019-2023 Guillaume Le Vaillant <glv@posteo.net> +;;; Copyright © 2019-2024 Guillaume Le Vaillant <glv@posteo.net> ;;; Copyright © 2019 Tanguy Le Carrour <tanguy@bioneland.org> ;;; Copyright © 2019, 2020 Martin Becze <mjbecze@riseup.net> ;;; Copyright © 2019 Sebastian Schott <sschott@mailbox.org> @@ -1690,9 +1690,8 @@ trezord as a regular user instead of needing to it run as root.") (file-name (git-file-name name version)))) (build-system go-build-system) (arguments - `(#:import-path "github.com/trezor/trezord-go" - ;; Requires go 1.18 or later: https://github.com/trezor/trezord-go/commit/f559ee5079679aeb5f897c65318d3310f78223ca - #:go ,go-1.20)) + `(#:go ,go-1.18 + #:import-path "github.com/trezor/trezord-go")) (native-inputs (list go-github-com-gorilla-csrf go-github-com-gorilla-handlers @@ -2379,7 +2378,7 @@ mining.") (define-public p2pool (package (name "p2pool") - (version "3.10") + (version "4.0") (source (origin (method git-fetch) @@ -2388,7 +2387,7 @@ mining.") (commit (string-append "v" version)) (recursive? #t))) (file-name (git-file-name name version)) - (sha256 (base32 "0lp9slfwaq3wp4x6xpsiazam5lv6dz57m20adzlzzk0anb1ascr0")) + (sha256 (base32 "0x6s7fm5gn0q2274b2nja8hj84cvmxp4rr9x4xw050sxj74880jh")) (modules '((guix build utils))) (snippet #~(for-each delete-file-recursively @@ -2397,10 +2396,11 @@ mining.") "external/src/curl" "external/src/libuv" "external/src/libzmq" - "external/src/rapidjson"))))) + "external/src/rapidjson" + "external/src/robin-hood-hashing"))))) (build-system cmake-build-system) (inputs - (list cppzmq curl gss libuv rapidjson zeromq)) + (list cppzmq curl gss libuv rapidjson robin-hood-hashing zeromq)) (arguments (list ; FIXME: Linking fails when LTO is activated. #:configure-flags #~(list "-DWITH_LTO=OFF") @@ -2411,7 +2411,7 @@ mining.") (when tests? (mkdir-p "tests") (chdir "tests") - (invoke "cmake" "../../source/tests") + (invoke "cmake" "-DWITH_LTO=OFF" "../../source/tests") (invoke "make" "-j" (number->string (parallel-job-count))) (invoke "gzip" "-d" "sidechain_dump.dat.gz") (invoke "gzip" "-d" "sidechain_dump_mini.dat.gz") diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index 0ed6609c26..7908e1a3fc 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -882,6 +882,9 @@ Executables included are: @item @code{VfrCompile}: Parse preprocessed UEFI and Framework VFR files. @item @code{VolInfo}: Display the contents of a firmware volume. @end itemize") + ;; See BaseTools/Source/C/GNUmakefile + (supported-systems '("x86_64-linux" "i686-linux" "armhf-linux" + "aarch64-linux" "riscv64-linux")) (license license:bsd-2))) (define* (make-ovmf-firmware arch) diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index a21c6b4d5a..8d9e5ff3d1 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -197,6 +197,26 @@ fonts have been designed to work well in user interface (UI) environments as well as other mediums.") (license license:silofl1.1))) +(define-public font-lilex + (package + (name "font-lilex") + (version "2.510") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/mishamyrt/Lilex/releases/download/" + version + "/Lilex.zip")) + (sha256 + (base32 + "0dq54qk4q1ymdqnp0skxdxzhx475g2gihzs8ijx0nffa29fwzn9g")))) + (build-system font-build-system) + (home-page "https://github.com/mishamyrt/Lilex") + (synopsis "IBM Plex typeface with extended character sets and ligatures") + (description "Lilex is a modern programming font containing a set of +ligatures for common programming multi-character combinations.") + (license license:silofl1.1))) + (define-public font-inconsolata (package (name "font-inconsolata") @@ -2498,6 +2518,34 @@ formatting.") (home-page "https://madmalik.github.io/mononoki/") (license license:silofl1.1))) +(define-public font-paytone-one + (let ((version "0") + (commit "b1438bc11966d48a1e9e8943b7b8a32dcb0c533c") + (revision "0")) + (package + (name "font-paytone-one") + (version (git-version version revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/googlefonts/paytoneFont") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1gbmrjx8yj8xjh6fs0pzh8j0kxvwvhhjlp16gmv5c7i6b8s7r4r2")))) + (build-system font-build-system) + (home-page "https://github.com/googlefonts/paytoneFont") + (synopsis "Sans serif typeface") + (description "Paytone One is a sans serif typeface developed for +use as a display and headlining webfont. + +The face has a slight casual appearance with ample round bowls. The +slanted stroke terminals add some visual play to the overall appearance +of the font.") + (license license:silofl1.1)))) + (define-public font-plemoljp (package (name "font-plemoljp") diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 6941450436..222ea0fb0b 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -143,7 +143,7 @@ (define-public appstream (package (name "appstream") - (version "0.16.4") + (version "1.0.3") (source (origin (method url-fetch) @@ -152,9 +152,7 @@ "appstream/releases/" "AppStream-" version ".tar.xz")) (sha256 - (base32 "1val1b3dggn9g33q2r9q7wsl75a64x4lcvswvkcjjbvakkbj5xyl")) - (patches - (search-patches "appstream-force-reload-stemmer.patch")))) + (base32 "195snvg2jw5ywqxz02xfb570yhxvaqp9d4w5a2lpay2fck7zddjs")))) (build-system meson-build-system) (arguments (list @@ -166,9 +164,9 @@ (lambda* (#:key inputs #:allow-other-keys) (let ((libstemmer.h (search-input-file inputs "include/libstemmer.h"))) - (substitute* "meson.build" - (("/usr/include") - (dirname libstemmer.h)))))) + (substitute* "meson.build" + (("/usr/include") + (dirname libstemmer.h)))))) (add-before 'check 'check-setup (lambda _ (setenv "HOME" (getcwd))))))) @@ -184,7 +182,8 @@ itstool libxslt pkg-config - python-wrapper)) + python-wrapper + gi-docgen)) (inputs (list curl libsoup-minimal-2 libstemmer libxmlb libxml2 libyaml lmdb)) (propagated-inputs @@ -213,7 +212,21 @@ application-centers for distributions.") (arguments (substitute-keyword-arguments (package-arguments appstream) ((#:configure-flags flags #~'()) - #~(append '("-Dqt=true") #$flags)))))) + #~(append '("-Dqt=true" "-Dqt-versions=5") #$flags)))))) + +(define-public appstream-qt6 + (package/inherit appstream + (name "appstream-qt6") + (native-inputs + (modify-inputs (package-native-inputs appstream) + (prepend qttools))) + (inputs + (modify-inputs (package-inputs appstream) + (prepend qtbase))) + (arguments + (substitute-keyword-arguments (package-arguments appstream) + ((#:configure-flags flags #~'()) + #~(append '("-Dqt=true" "-Dqt-versions=6") #$flags)))))) (define-public farstream (package @@ -1405,6 +1418,19 @@ protocol either in Wayland core, or some other protocol in wayland-protocols.") . "https://wayland.freedesktop.org/releases.html"))) (license license:expat))) +(define-public wayland-protocols-next + (package (inherit wayland-protocols) + (name "wayland-protocols-next") + (version "1.36") + (source (origin + (method url-fetch) + (uri (string-append "https://gitlab.freedesktop.org/wayland/" + "wayland-protocols/-/releases/" version "/downloads/" + "wayland-protocols-" version ".tar.xz")) + (sha256 + (base32 + "14kyxywpfkgpjpkrybs28q1s2prnz30k1b4zap5a3ybrbvh4vzbi")))))) + (define-public wayland-utils (package (name "wayland-utils") @@ -3111,16 +3137,22 @@ interfaces.") (define-public xdg-desktop-portal-kde (package (name "xdg-desktop-portal-kde") - (version "5.27.6") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "0wzp21l521d9z9mnfgiapzljqpg5qc5ghyzndpr8cz54c2bf9mdf")))) + "0dksk5zs4w79n9l8wspwdgzx2fj1xafsjjk4d6bv2hrhhly7bnxr")))) (build-system qt-build-system) - (native-inputs (list extra-cmake-modules pkg-config)) + (arguments (list + #:tests? #f ;; colorschemetest test fail, because require dbus. + #:qtbase qtbase)) + (native-inputs (list extra-cmake-modules pkg-config + ;; require by test. + python-minimal + python-pygobject)) (inputs (list cups kcoreaddons kconfig @@ -3129,20 +3161,22 @@ interfaces.") kio kirigami knotifications - plasma-framework + libplasma plasma-wayland-protocols + kstatusnotifieritem kwayland kwidgetsaddons kwindowsystem kiconthemes - qtdeclarative-5 - qtwayland-5 + qtdeclarative + qtwayland wayland kglobalaccel kguiaddons libxkbcommon - kio-fuse wayland-protocols)) + (propagated-inputs + (list xdg-desktop-portal)) (synopsis "Backend implementation for xdg-desktop-portal using Qt/KF5") (description "This package provides a backend implementation for xdg-desktop-portal that is using Qt/KF5.") diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 9923ca9195..954a4ad4a0 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -2515,7 +2515,7 @@ data.") proj qtbase-5 qtdeclarative-5 - qtlocation + qtlocation-5 qtwebchannel-5 qtwebengine-5 quazip @@ -2751,7 +2751,7 @@ track your position right from your laptop.") proj qtbase-5 qtimageformats-5 - qtlocation + qtlocation-5 qtsensors-5 zlib)) (native-inputs @@ -3213,7 +3213,7 @@ SET\\(PYQT5_SIP_DIR \"\\$\\{Python_SITEARCH\\}/PyQt5/bindings\"\\)") qtbase-5 qtdeclarative-5 qtkeychain - qtlocation + qtlocation-5 qtmultimedia-5 qtserialport-5 qtsvg-5 diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index b4caaf29a7..88e647dd65 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -78,6 +78,7 @@ ;;; Copyright © 2023 Dominik Delgado Steuter <d@delgado.nrw> ;;; Copyright © 2023 Zhu Zihao <all_but_last@163.com> ;;; Copyright © 2024 Dariqq <dariqq@posteo.net> +;;; Copyright © 2024 James Smith <jsubuntuxp@disroot.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -11555,34 +11556,34 @@ views can be printed as PDF or PostScript files, or exported to HTML.") (define-public lollypop (package (name "lollypop") - (version "1.4.35") + (version "1.4.40") (source (origin (method url-fetch) (uri (string-append "https://adishatz.org/lollypop/" "lollypop-" version ".tar.xz")) (sha256 - (base32 "0rvwj18x1gs7fgvniijzvlmgmzcgr7il22zclzsn5nkl8xbwgzk0")))) + (base32 "1laj5xwfz2bz29scga2ahhnhlgll4a0n21wwy8mlr4jsl81g0jsa")))) (build-system meson-build-system) (arguments - `(#:imported-modules (,@%meson-build-system-modules - (guix build python-build-system)) - #:modules ((guix build meson-build-system) - ((guix build python-build-system) #:prefix python:) - (guix build utils)) - #:glib-or-gtk? #t - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'disable-gtk-update-icon-cache - (lambda _ - (setenv "DESTDIR" "/"))) - (add-after 'install 'wrap-program - (lambda* (#:key outputs #:allow-other-keys) - (wrap-program (search-input-file outputs "bin/lollypop") - `("GI_TYPELIB_PATH" ":" prefix - (,(getenv "GI_TYPELIB_PATH")))))) - (add-after 'install 'wrap-python - (assoc-ref python:%standard-phases 'wrap))))) + (list #:imported-modules `(,@%meson-build-system-modules + (guix build python-build-system)) + #:modules '((guix build meson-build-system) + ((guix build python-build-system) #:prefix python:) + (guix build utils)) + #:glib-or-gtk? #t + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'disable-gtk-update-icon-cache + (lambda _ + (setenv "DESTDIR" "/"))) + (add-after 'install 'wrap-program + (lambda* (#:key outputs #:allow-other-keys) + (wrap-program (search-input-file outputs "bin/lollypop") + (list "GI_TYPELIB_PATH" ":" 'prefix + (list (getenv "GI_TYPELIB_PATH")))))) + (add-after 'install 'wrap-python + (assoc-ref python:%standard-phases 'wrap))))) (native-inputs (list gettext-minimal `(,glib "bin") ; For glib-compile-resources @@ -13510,17 +13511,17 @@ profiler via Sysprof, debugging support, and more.") (define-public komikku (package (name "komikku") - (version "1.34.2") + (version "1.46.0") (source (origin (method git-fetch) (uri (git-reference - (url "https://gitlab.com/valos/Komikku/") + (url "https://codeberg.org/valos/Komikku/") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "044m3z7h1hi2avx4z6qgjzhgn1fkf1iclxhr4j7pb6flbqvwnxhs")))) + "1ggg4hgd1kyc69b06kcgvvjwmz72xgjakva19gs3nrszr4cinank")))) (build-system meson-build-system) (arguments (list @@ -13546,7 +13547,9 @@ profiler via Sysprof, debugging support, and more.") (lambda* (#:key outputs #:allow-other-keys) (wrap-program (search-input-file outputs "bin/komikku") `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH"))) - `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))))))) + `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))) + `("GDK_PIXBUF_MODULE_FILE" = + (,(getenv "GDK_PIXBUF_MODULE_FILE"))))))))) (inputs (list bash-minimal gtk @@ -13572,7 +13575,8 @@ profiler via Sysprof, debugging support, and more.") python-rarfile python-requests python-unidecode - webkitgtk)) + webkitgtk + webp-pixbuf-loader)) (native-inputs (list blueprint-compiler desktop-file-utils @@ -13580,7 +13584,7 @@ profiler via Sysprof, debugging support, and more.") `(,glib "bin") gobject-introspection pkg-config)) - (home-page "https://gitlab.com/valos/Komikku") + (home-page "https://apps.gnome.org/Komikku") (synopsis "Manga reader for GNOME") (description "Komikku is an online/offline manga reader for GNOME, developed with the aim of being used with the Librem 5 phone.") @@ -13752,7 +13756,7 @@ Document Analysis and Recognition program.") (define-public libadwaita (package (name "libadwaita") - (version "1.4.0") + (version "1.5.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/libadwaita/" @@ -13760,7 +13764,7 @@ Document Analysis and Recognition program.") "libadwaita-" version ".tar.xz")) (sha256 (base32 - "1hj7kxza6263x662v4ffndlz8dhfx19cz3y4iwhnhdflaj50j6p5")))) + "05icswk84kf4pbcybv8j9r9n98q1dgr1m7zn6k72p4dlbh0fxyn9")))) (build-system meson-build-system) (arguments `(#:phases diff --git a/gnu/packages/gnucash.scm b/gnu/packages/gnucash.scm index ce99c04e39..af024b2a04 100644 --- a/gnu/packages/gnucash.scm +++ b/gnu/packages/gnucash.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2019, 2021 Guillaume Le Vaillant <glv@posteo.net> ;;; Copyright © 2020 Prafulla Giri <pratheblackdiamond@gmail.com> ;;; Copyright © 2020 Christopher Lam <christopher.lck@gmail.com> -;;; Copyright © 2023 gemmaro <gemmaro.dev@gmail.com> +;;; Copyright © 2023, 2024 gemmaro <gemmaro.dev@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -66,14 +66,14 @@ ;; directory. (package (name "gnucash") - (version "5.6") + (version "5.8") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/gnucash/gnucash%20%28stable%29/" version "/gnucash-" version ".tar.bz2")) (sha256 - (base32 "1l8vy8dj48hz385ldwnx3bpdsqyc8lsigwm1gjgygwshcdi2rd5l")))) + (base32 "14r5nmml40icxbjfz4giis6kiplvjna17j1fd6c4b78bf3xj7j52")))) (outputs '("out" "doc" "debug" "python")) (build-system cmake-build-system) (arguments @@ -219,7 +219,7 @@ installed as well as Yelp, the Gnome help browser.") "mirror://sourceforge/gnucash/gnucash%20%28stable%29/" version "/gnucash-docs-" version revision ".tar.gz")) (sha256 - (base32 "00izzaswwp78ix0zdr8618lk2c21had4im04yrggqx4h34ldmnca")))) + (base32 "0gssmbwwiafp4g9v5waz5935bkgyzbna76ryz5lhc294b3n49wxq")))) (build-system cmake-build-system) ;; These are native-inputs because they are only required for building the ;; documentation. diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index e7c583a266..14c25998d8 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -466,6 +466,19 @@ and every application benefits from this.") (properties '((ftp-server . "ftp.gnupg.org") (ftp-directory . "/gcrypt/gpgme"))))) +(define-public gpgme-1.23 + (hidden-package + (package + (inherit gpgme) + (name "gpgme") + (version "1.23.2") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://gnupg/gpgme/gpgme-" version ".tar.bz2")) + (sha256 + (base32 "092jrqdmdggjhl0swpvci8cscdcx0hbbr897an0vdk1wyfqyi6cl"))))))) + (define-public qgpgme (package (inherit gpgme) @@ -495,6 +508,32 @@ QGpgME was originally developed as part of libkleo and incorporated into gpgpme starting with version 1.7.") (license license:gpl2+))) ;; Note: this differs from gpgme +(define-public qgpgme-qt6-1.23 + (package + (inherit gpgme-1.23) + (name "qgpgme-qt6") + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'build 'chdir-and-symlink + (lambda* (#:key inputs #:allow-other-keys) + (let ((gpgme (assoc-ref inputs "gpgme"))) + (symlink (string-append gpgme "/lib/libgpgmepp.la") + "lang/cpp/src/libgpgmepp.la") + (symlink (string-append gpgme "/lib/libgpgme.la") + "src/libgpgme.la")) + (chdir "lang/qt")))))) + (propagated-inputs (list gpgme-1.23)) ;required by QGpgmeConfig.cmake + (native-inputs + (modify-inputs (package-native-inputs gpgme-1.23) + (prepend pkg-config))) + (inputs + (modify-inputs (package-inputs gpgme-1.23) + (prepend qtbase))) + (synopsis "Qt API bindings for gpgme") + (description "QGpgme provides a very high level Qt API around GpgMEpp.") + (license license:gpl2+))) + (define-public guile-gcrypt (package (name "guile-gcrypt") diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index e6d29d5f90..3e7818ba43 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -532,9 +532,9 @@ variable defined below. It requires guile-json to be installed." ;; XXXX: Workaround 'snippet' limitations. (define computed-origin-method (@@ (guix packages) computed-origin-method)) -(define %icecat-base-version "115.12.0") -(define %icecat-version (string-append %icecat-base-version "-guix0-preview1")) -(define %icecat-build-id "20240611000000") ;must be of the form YYYYMMDDhhmmss +(define %icecat-base-version "115.13.0") +(define %icecat-version (string-append %icecat-base-version "-guix1")) +(define %icecat-build-id "20240709000000") ;must be of the form YYYYMMDDhhmmss ;; 'icecat-source' is a "computed" origin that generates an IceCat tarball ;; from the corresponding upstream Firefox ESR tarball, using the 'makeicecat' @@ -554,12 +554,12 @@ variable defined below. It requires guile-json to be installed." "firefox-" upstream-firefox-version ".source.tar.xz")) (sha256 (base32 - "1vx88wc10fjkvqdqf3ab65qk3km7z0mlyf9plxjhabxvl0jid7mm")))) + "0p2x1prwa1yn2d3i7vgjc4gg64x4si43l68aav9881hhjwc0v8iz")))) ;; The upstream-icecat-base-version may be older than the ;; %icecat-base-version. - (upstream-icecat-base-version "115.12.0") - (gnuzilla-commit "f200ffe88821f66234591096bcbe87b0c11f8da0") + (upstream-icecat-base-version "115.13.0") + (gnuzilla-commit "445980b18666c8214e5c62db3ae7108d5694242f") (gnuzilla-source (origin (method git-fetch) @@ -571,7 +571,7 @@ variable defined below. It requires guile-json to be installed." (string-take gnuzilla-commit 8))) (sha256 (base32 - "154rjpn4vr2hqyrfbpwp6dvkzsv1cwisdf82v7dsda55012qaxg7")))) + "12jdlr86kr26h2ml5j8pjsjc8lpjxw05hqpirvlgj317xv0amyz1")))) ;; 'search-patch' returns either a valid file name or #f, so wrap it ;; in 'assume-valid-file-name' to avoid 'local-file' warnings. @@ -1142,11 +1142,7 @@ variable defined below. It requires guile-json to be installed." software, which does not recommend non-free plugins and addons. It also features built-in privacy-protecting features. This package also includes the @command{geckodriver} command, which can be useful for automated web -testing. - -WARNING: IceCat 115 has not yet been released by the upstream IceCat project. -This is a preview release, and does not currently meet the privacy-respecting -standards of the IceCat project.") +testing.") (license license:mpl2.0) ;and others, see toolkit/content/license.html (properties `((ftp-directory . "/gnu/gnuzilla") diff --git a/gnu/packages/golang-build.scm b/gnu/packages/golang-build.scm index 086dbaeb17..d2ee54f021 100644 --- a/gnu/packages/golang-build.scm +++ b/gnu/packages/golang-build.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2019 Brian Leung <bkleung89@gmail.com> ;;; Copyright © 2019, 2020 Leo Famulari <leo@famulari.name> ;;; Copyright © 2020 Danny Milosavljevic <dannym@scratchpost.org> -;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2020, 2024 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2020 HiPhish <hiphish@posteo.de> ;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com> ;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com> @@ -40,7 +40,8 @@ #:use-module (guix git-download) #:use-module (guix packages) #:use-module (guix utils) - #:use-module (gnu packages)) + #:use-module (gnu packages) + #:use-module (gnu packages gcc)) ;;; Commentary: ;;; @@ -58,7 +59,7 @@ (define-public go-github-com-yuin-goldmark (package (name "go-github-com-yuin-goldmark") - (version "1.2.1") + (version "1.7.4") (source (origin (method git-fetch) @@ -67,53 +68,149 @@ (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "12rsnsf65drcp0jfw2jl9w589vsn3pxdk1zh3v9q908iigngrcmy")))) + (base32 "01807xs8501cyhkrrgg6k9ghl9jrw6dp0ry9knygck48canckxs2")))) (build-system go-build-system) (arguments - `(#:import-path "github.com/yuin/goldmark")) + (list + #:import-path "github.com/yuin/goldmark" + #:phases + #~(modify-phases %standard-phases + ;; XXX: Workaround for go-build-system's lack of Go modules + ;; support. + (replace 'check + (lambda* (#:key tests? import-path #:allow-other-keys) + (when tests? + ;; We need to extend the timeout on some architectures. + ;; 64 is the default in extra_test.go. + (setenv "GOLDMARK_TEST_TIMEOUT_MULTIPLIER" + (number->string (* 64 5))) + (with-directory-excursion (string-append "src/" import-path) + (invoke "go" "test" "-v" "./...")))))))) (home-page "https://github.com/yuin/goldmark/") (synopsis "Markdown parser") - (description "This package provides a markdown parser.") + (description + "This package provides a markdown parser.") + (license license:expat))) + +(define-public go-github-com-yuin-goldmark-emoji + (package + (name "go-github-com-yuin-goldmark-emoji") + (version "1.0.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/yuin/goldmark-emoji") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1mx8rkxd3ksvgi41jvf365x9mf00sxiqq4wm75x4sasd2lgcbrl4")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/yuin/goldmark-emoji")) + (propagated-inputs + (list go-github-com-yuin-goldmark)) + (home-page "https://github.com/yuin/goldmark-emoji") + (synopsis "Emoji extension for the goldmark markdown parser") + (description + "This package provides an emoji is a extension for the +@url{http://github.com/yuin/goldmark,goldmark}.") (license license:expat))) (define-public go-golang-org-x-crypto (package (name "go-golang-org-x-crypto") - (version "0.14.0") + (version "0.25.0") (source (origin (method git-fetch) (uri (git-reference (url "https://go.googlesource.com/crypto") (commit (string-append "v" version)))) - (file-name (string-append "go.googlesource.com-crypto-" - version "-checkout")) + (file-name (git-file-name name version)) (sha256 - (base32 "08124qkp0l0blq6rw68llfbf84kp99255q0yvxyv27c05b0wkh66")))) + (base32 "1cnglyy3fhvnnynazfdrikkwcxv3rlxamvfxink2z241lncvwkxy")))) (build-system go-build-system) (arguments - '(#:import-path "golang.org/x/crypto" - ;; Source-only package - #:tests? #f - #:phases - (modify-phases %standard-phases - ;; Source-only package - (delete 'build)))) + (list + #:import-path "golang.org/x/crypto" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'remove-test-files + (lambda* (#:key import-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-path) + (for-each delete-file + (list + ;; Network access requried: go mod download -json + ;; github.com/google/wycheproof@v0.0.0-20191219022705-2196000605e4. + "internal/wycheproof/aead_test.go" + "internal/wycheproof/aes_cbc_test.go" + "internal/wycheproof/dsa_test.go" + "internal/wycheproof/ecdh_stdlib_test.go" + "internal/wycheproof/ecdh_test.go" + "internal/wycheproof/ecdsa_test.go" + "internal/wycheproof/eddsa_test.go" + "internal/wycheproof/hkdf_test.go" + "internal/wycheproof/hmac_test.go" + "internal/wycheproof/rsa_oaep_decrypt_test.go" + "internal/wycheproof/rsa_pss_test.go" + "internal/wycheproof/rsa_signature_test.go" + "internal/wycheproof/wycheproof_test.go"))))) + ;; XXX: Workaround for go-build-system's lack of Go modules + ;; support. + (delete 'build) + (replace 'check + (lambda* (#:key tests? import-path #:allow-other-keys) + (when tests? + (with-directory-excursion (string-append "src/" import-path) + (invoke "go" "test" "-v" + ;; acme - cycle with go-golang-org-x-net + "./argon2/..." + "./bcrypt/..." + "./blake2b/..." + "./blake2s/..." + "./blowfish/..." + "./bn256/..." + "./cast5/..." + "./chacha20/..." + "./chacha20poly1305/..." + "./cryptobyte/..." + "./curve25519/..." + "./ed25519/..." + "./hkdf/..." + "./internal/..." + "./md4/..." + "./nacl/..." + "./ocsp/..." + "./openpgp/..." + "./otr/..." + "./pbkdf2/..." + "./pkcs12/..." + "./poly1305/..." + "./ripemd160/..." + "./salsa20/..." + "./scrypt/..." + "./sha3/..." + "./ssh/..." + "./tea/..." + "./twofish/..." + "./x509roots/..." + "./xtea/..." + "./xts/...")))))))) (propagated-inputs - (list go-golang-org-x-net - go-golang-org-x-sys - go-golang-org-x-term - go-golang-org-x-text)) + (list go-golang-org-x-sys go-golang-org-x-term)) (home-page "https://go.googlesource.com/crypto/") (synopsis "Supplementary cryptographic libraries in Go") - (description "This package provides supplementary cryptographic libraries -for the Go language.") + (description + "This package provides supplementary cryptographic libraries for the Go +language.") (license license:bsd-3))) (define-public go-golang-org-x-exp (package (name "go-golang-org-x-exp") - (version "0.0.0-20221004215720-b9f4876ce741") + (version "0.0.0-20240613232115-7f521ea00fb8") (source (origin (method git-fetch) @@ -122,7 +219,20 @@ for the Go language.") (commit (go-version->git-ref version)))) (file-name (git-file-name name version)) (sha256 - (base32 "030b929xyg8dpp6f4qbyg63msi6zgzj9sqmvnyphfcrjkqf7nr41")))) + (base32 "0ccjgv19w5p9sbcq12czmfnkjwv3b7hfljifwax6r9wk4dx0fcn7")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Submodules with their own go.mod files and packed as separated + ;; packages: + ;; + ;; - golang.org/x/exp/event + ;; - golang.org/x/exp/jsonrpc2 + ;; - golang.org/x/exp/shiny + ;; - golang.org/x/exp/sumbdb + ;; - golang.org/x/exp/typeparams + (for-each delete-file-recursively + (list "event" "jsonrpc2" "shiny" "sumdb" "typeparams")))))) (build-system go-build-system) (arguments '(#:import-path "golang.org/x/exp" @@ -136,12 +246,10 @@ for the Go language.") @code{old} directory) packages.") (license license:bsd-3))) -;; It's for the Kubo update; remove it when it is no longer needed. -(define-public go-golang-org-x-exp-2023 +(define-public go-golang-org-x-exp-typeparams (package - (inherit go-golang-org-x-exp) - (name "go-golang-org-x-exp") - (version "0.0.0-20230725012225-302865e7556b") + (name "go-golang-org-x-exp-typeparams") + (version "0.0.0-20240707233637-46b078467d37") (source (origin (method git-fetch) @@ -150,122 +258,161 @@ for the Go language.") (commit (go-version->git-ref version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1fkmi0zjwv70n9d9q9bmzch2zvf7xm3d65qh63zll6dljq2lh4b8")))))) + (base32 "17pwikql9x1bm5ci0kk4mlad7smkph0cgq1pi2b43gnhjz8m96l0")))) + (build-system go-build-system) + (arguments + (list + #:import-path "golang.org/x/exp/typeparams" + #:unpack-path "golang.org/x/exp")) + (home-page "https://pkg.go.dev/golang.org/x/exp/typeparams") + (synopsis "Golang common utilities for writing tools") + (description + "Package typeparams contains common utilities for writing tools that +interact with generic Go code, as introduced with Go 1.18. + +Many of the types and functions in this package are proxies for the new APIs +introduced in the standard library with Go 1.18. For example, the +typeparams.Union type is an alias for @code{go/types.Union}, and the +@code{ForTypeSpec} function returns the value of the +@code{go/ast.TypeSpec.TypeParams} field. At Go versions older than 1.18 these +helpers are implemented as stubs, allowing users of this package to write code +that handles generic constructs inline,even if the Go version being used to +compile does not support generics.") + (license license:bsd-3))) (define-public go-golang-org-x-image - (let ((commit "58c23975cae11f062d4b3b0c143fe248faac195d") - (revision "1")) - (package - (name "go-golang-org-x-image") - (version (git-version "0.0.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://go.googlesource.com/image") - (commit commit))) - (file-name (string-append "go.googlesource.com-image-" - version "-checkout")) - (sha256 - (base32 "0i2p2girc1sfcic6xs6vrq0fp3szfx057xppksb67kliywjjrm5x")))) - (build-system go-build-system) - (arguments - `(#:import-path "golang.org/x/image" - ;; Source-only package - #:tests? #f - #:phases - (modify-phases %standard-phases - (delete 'build)))) - (home-page "https://go.googlesource.com/image") - (synopsis "Supplemental Go image libraries") - (description "This package provides supplemental Go libraries for image -processing.") - (license license:bsd-3)))) + (package + (name "go-golang-org-x-image") + (version "0.18.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://go.googlesource.com/image") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0d7zwdsg06km24vhx6dzk1w26wpi3yhx9jfkf9jnsp5chv5pzlw3")))) + (build-system go-build-system) + (arguments + (list + #:import-path "golang.org/x/image" + #:phases + #~(modify-phases %standard-phases + ;; XXX: go-build-system can't install/build submodules. + (delete 'build) + (add-after 'unpack 'remove-examples + (lambda* (#:key import-path #:allow-other-keys) + (delete-file-recursively + (string-append "src/" import-path "/example")))) + (add-before 'check 'remove-failing-tests + (lambda* (#:key import-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-path) + (for-each delete-file + ;; tiff/reader_test.go:557:14: too many errors + (list "tiff/reader_test.go" + "tiff/writer_test.go"))))) + ;; XXX: Workaround for go-build-system's lack of Go modules support. + (replace 'check + (lambda* (#:key tests? import-path #:allow-other-keys) + (when tests? + (with-directory-excursion (string-append "src/" import-path) + (invoke "go" "test" "-v" "./...")))))))) + (propagated-inputs + (list go-golang-org-x-text)) + (home-page "https://pkg.go.dev/golang.org/x/image") + (synopsis "Supplemental Go image libraries") + (description + "This package provides supplemental Go libraries for image processing.") + (license license:bsd-3))) (define-public go-golang-org-x-mod - (let ((commit "7c05a442b7c1d1a107879b4a090bb5a38d3774a1") - (revision "0")) - (package - (name "go-golang-org-x-mod") - (version (git-version "0.7.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/golang/mod") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "14r24fq3kn84k2y2jvvg8hwpy52a3q429pimrdwl5zwknbr2awmh")))) - (build-system go-build-system) - (arguments - '(#:import-path "golang.org/x/mod/" - #:tests? #f - #:phases (modify-phases %standard-phases - ;; Source-only package - (delete 'build)))) - (home-page "https://golang.org/x/mod") - (synopsis "Tools to work directly with Go module mechanics") - (description - "This repository holds packages for writing tools that work directly + (package + (name "go-golang-org-x-mod") + (version "0.19.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://go.googlesource.com/mod") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "02wilb8q2bp6qhqcrbjxq1pjy3y5k8p11pxlg481609zx4rjiszc")))) + (build-system go-build-system) + (arguments + (list + #:import-path "golang.org/x/mod" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'remove-test-files + (lambda* (#:key import-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-path) + (for-each delete-file + (list + ;; Break cycle: go-golang-org-x-mod -> + ;; go-golang-org-x-tools -> go-golang-org-x-mod. + "zip/zip_test.go" + ;; Trying to access + ;; <http://ct.googleapis.com/logs/argon2020/ct/v1/get-sth>. + "sumdb/tlog/ct_test.go"))))) + ;; XXX: Workaround for go-build-system's lack of Go modules + ;; support. + (delete 'build) + (replace 'check + (lambda* (#:key tests? import-path #:allow-other-keys) + (when tests? + (with-directory-excursion (string-append "src/" import-path) + (invoke "go" "test" "-v" "./...")))))))) + (home-page "https://golang.org/x/mod") + (synopsis "Tools to work directly with Go module mechanics") + (description + "This repository holds packages for writing tools that work directly with Go module mechanics. That is, it is for direct manipulation of Go modules themselves. The specific case of loading packages should still be done by invoking the @command{go} command, which remains the single point of truth for package loading algorithms.") - (license license:bsd-3)))) + (license license:bsd-3))) (define-public go-golang-org-x-net - (let ((commit "8e0e7d8d38f2b6d21d742845570dde2902d06a1d") - (revision "0")) - (package - (name "go-golang-org-x-net") - (version (git-version "0.5.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://go.googlesource.com/net") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1fidlcn3vcz42v2lc0rpmqh3bz08bcklj6jvnmz2vvgc481ci5hy")))) - (build-system go-build-system) - (arguments - (list - #:import-path "golang.org/x/net" - ;; Source-only package - #:tests? #f - #:phases - #~(modify-phases %standard-phases - ;; Source-only package - (delete 'build)))) - (propagated-inputs - (list go-golang-org-x-sys go-golang-org-x-term go-golang-org-x-text)) - (home-page "https://go.googlesource.com/net") - (synopsis "Go supplemental networking libraries") - (description "This package provides supplemental Go networking libraries.") - (license license:bsd-3)))) - -;; XXX: Not in use by any other packages, consider to remove or merge with -;; go-golang-org-x-net. -(define-public go-golang-org-x-net-0.17 - (let ((commit "b225e7ca6dde1ef5a5ae5ce922861bda011cfabd") - (revision "0")) - (package - (inherit go-golang-org-x-net) - (name "go-golang-org-x-net") - (version (git-version "0.17.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://go.googlesource.com/net") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "17zhim2m0r8nyy18g2lsawxm4rawix2qbjyn80x9vc6jc8fv05m9"))))))) + (package + (name "go-golang-org-x-net") + (version "0.27.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://go.googlesource.com/net") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0fc6d968yiv2l67z9jg7ssvas1hd1jniqh4m7mmlay0q5gk4vf8s")))) + (build-system go-build-system) + (arguments + (list + #:import-path "golang.org/x/net" + #:phases + #~(modify-phases %standard-phases + ;; XXX: Workaround for go-build-system's lack of Go modules + ;; support. + (delete 'build) + (replace 'check + (lambda* (#:key tests? import-path #:allow-other-keys) + (when tests? + (with-directory-excursion (string-append "src/" import-path) + (invoke "go" "test" "-v" "./...")))))))) + (propagated-inputs + (list go-golang-org-x-crypto + go-golang-org-x-sys + go-golang-org-x-term + go-golang-org-x-text)) + (home-page "https://go.googlesource.com/net") + (synopsis "Go supplemental networking libraries") + (description + "This package provides supplemental Go networking libraries.") + (license license:bsd-3))) (define-public go-golang-org-x-sync (package @@ -312,7 +459,7 @@ cancelation for groups of goroutines working on subtasks of a common task (define-public go-golang-org-x-sys (package (name "go-golang-org-x-sys") - (version "0.21.0") + (version "0.22.0") (source (origin (method git-fetch) @@ -321,7 +468,7 @@ cancelation for groups of goroutines working on subtasks of a common task (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "000fcyi863sbmamdn3cwfv3s3z9ls5l34xnjavcbgjs591ghki8y")))) + (base32 "0kpl5hk0zbh5bfschnq64yj1cs7v3l9v6bd1rw5crlfd4hg7xawa")))) (build-system go-build-system) (arguments (list @@ -345,7 +492,7 @@ support for low-level interaction with the operating system.") (define-public go-golang-org-x-term (package (name "go-golang-org-x-term") - (version "0.3.0") + (version "0.22.0") (source (origin (method git-fetch) @@ -354,7 +501,7 @@ support for low-level interaction with the operating system.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "16s3d62fgdhiqvcib61s5pwxp08hhrmzx8bdv5zk1w1krjizdarl")))) + (base32 "0iqh035y65gfm28xp52pnksh49q3nyaz0zrjjj032rs8hv5py75m")))) (build-system go-build-system) (arguments '(#:import-path "golang.org/x/term")) (propagated-inputs @@ -368,65 +515,92 @@ terminals, as commonly found on Unix systems.") (define-public go-golang-org-x-text (package (name "go-golang-org-x-text") - (version "0.3.2") + (version "0.16.0") (source (origin (method git-fetch) (uri (git-reference (url "https://go.googlesource.com/text") (commit (string-append "v" version)))) - (file-name (string-append "go.googlesource.com-text-" - version "-checkout")) + (file-name (git-file-name name version)) (sha256 - (base32 "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh")))) + (base32 "0pmn0i1xbpwvzl4cdgmjqcsk9vckhqrq6699fnr9mkglh4xj3p7a")))) (build-system go-build-system) (arguments - `(#:import-path "golang.org/x/text" - ;; Source-only package - #:tests? #f - #:phases - (modify-phases %standard-phases - (delete 'build)))) + (list + #:import-path "golang.org/x/text" + #:phases + #~(modify-phases %standard-phases + ;; XXX: Workaround for go-build-system's lack of Go modules + ;; support. + (delete 'build) + (replace 'check + (lambda* (#:key tests? import-path #:allow-other-keys) + (when tests? + (with-directory-excursion (string-append "src/" import-path) + (invoke "go" "test" "-v" + "./cases/..." + ;; cmd - cycle with go-golang-org-x-tools + "./collate/..." + "./currency/..." + "./date/..." + "./encoding/..." + "./feature/..." + "./internal/..." + "./language/..." + ;; message - cycle with go-golang-org-x-tools + "./number/..." + "./runes/..." + "./search/..." + "./secure/..." + "./transform/..." + "./unicode/..." + "./width/...")))))))) (home-page "https://go.googlesource.com/text") (synopsis "Supplemental Go text processing libraries") - (description "This package provides supplemental Go libraries for text + (description + "This package provides supplemental Go libraries for text processing.") (license license:bsd-3))) (define-public go-golang-org-x-time - (let ((commit "9d24e82272b4f38b78bc8cff74fa936d31ccd8ef") - (revision "2")) - (package - (name "go-golang-org-x-time") - (version (git-version "0.0.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://go.googlesource.com/time") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1f5nkr4vys2vbd8wrwyiq2f5wcaahhpxmia85d1gshcbqjqf8dkb")))) - (build-system go-build-system) - (arguments - `(#:import-path "golang.org/x/time" - ;; Source-only package - #:tests? #f - #:phases - (modify-phases %standard-phases - ;; Source-only package - (delete 'build)))) - (home-page "https://godoc.org/golang.org/x/time/rate") - (synopsis "Supplemental Go time libraries") - (description "This package provides supplemental Go libraries related to + (package + (name "go-golang-org-x-time") + (version "0.5.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://go.googlesource.com/time") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1dahq0p6zn2pd408q6hsv1jl12nqrwd1gkl3r3dysk2q0z16192v")))) + (build-system go-build-system) + (arguments + (list + #:import-path "golang.org/x/time" + #:phases + #~(modify-phases %standard-phases + ;; XXX: Workaround for go-build-system's lack of Go modules + ;; support. + (delete 'build) + (replace 'check + (lambda* (#:key tests? import-path #:allow-other-keys) + (when tests? + (with-directory-excursion (string-append "src/" import-path) + (invoke "go" "test" "-v" "./...")))))))) + (home-page "https://godoc.org/golang.org/x/time/rate") + (synopsis "Supplemental Go time libraries") + (description + "This package provides supplemental Go libraries related to time.") - (license license:bsd-3)))) + (license license:bsd-3))) (define-public go-golang-org-x-tools (package (name "go-golang-org-x-tools") - (version "0.5.0") + (version "0.23.0") (source (origin (method git-fetch) @@ -435,7 +609,7 @@ time.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "08kx2nndq3sr6xai7403mbsqvz5shxmp2icylfr2fmwagr59cb2n")) + (base32 "0hr81fr5s39p97m9y3ipma7ryw4nm2246k8ds0flkybzf19mhzbi")) (modules '((guix build utils))) (snippet '(begin @@ -444,27 +618,68 @@ time.") (delete-file-recursively "gopls"))))) (build-system go-build-system) (arguments - `(#:import-path "golang.org/x/tools" - ;; Source-only package - #:tests? #f - #:phases - (modify-phases %standard-phases - ;; Source-only package - (delete 'build)))) + (list + #:import-path "golang.org/x/tools" + #:phases + #~(modify-phases %standard-phases + ;; XXX: Workaround for go-build-system's lack of Go modules + ;; support. + (delete 'build) + (replace 'check + (lambda* (#:key tests? import-path #:allow-other-keys) + (when tests? + (with-directory-excursion (string-append "src/" import-path) + (invoke "go" "test" "-v" + ;; TODO: They contain final project executable builds, + ;; would be packed separately. + ;; - cmd + ;; - godoc + + ;; FIXME: Figure out why they are failing: + ;; "./internal/..." + ;; "./present/..." + ;; "./refactor/eg/..." + ;; "./go/ssa/..." + ;; "./go/packages/..." + ;; "./go/analysis/..." + + "./blog/..." ; + "./container/..." + "./copyright/..." + "./cover/..." + "./go/ast/..." + "./go/buildutil/..." + "./go/callgraph/..." + "./go/cfg/..." + "./go/expect/..." + "./go/gccgoexportdata/..." + "./go/gcexportdata/..." + "./go/internal/..." + "./go/loader/..." + "./go/types/..." + "./imports/..." + "./playground/..." + "./refactor/importgraph/..." + "./refactor/rename/..." + "./refactor/satisfy/..." + "./txtar/...")))))))) + (native-inputs + (list gccgo-14)) (propagated-inputs (list go-github-com-yuin-goldmark go-golang-org-x-mod go-golang-org-x-net - go-golang-org-x-sys)) + go-golang-org-x-sync)) (home-page "https://go.googlesource.com/tools/") (synopsis "Tools that support the Go programming language") - (description "This package provides miscellaneous tools that support the + (description + "This package provides miscellaneous tools that support the Go programming language.") (license license:bsd-3))) (define-public go-golang-org-x-xerrors - (let ((commit "5ec99f83aff198f5fbd629d6c8d8eb38a04218ca") - (revision "0")) + (let ((commit "104605ab7028f4af38a8aff92ac848a51bd53c5d") + (revision "1")) (package (name "go-golang-org-x-xerrors") (version (git-version "0.0.0" revision commit)) @@ -476,7 +691,7 @@ Go programming language.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "1dbzc3gmf2haazpv7cgmv97rq40g2xzwbglc17vas8dwhgwgwrzb")))) + (base32 "051xfwx95vq7yhmsy8p9rq0qw67bzvimhz1icjssahwrjndm7h92")))) (build-system go-build-system) (arguments '(#:import-path "golang.org/x/xerrors")) diff --git a/gnu/packages/golang-check.scm b/gnu/packages/golang-check.scm index ddf2393406..0822338943 100644 --- a/gnu/packages/golang-check.scm +++ b/gnu/packages/golang-check.scm @@ -78,7 +78,6 @@ (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "atomicgo.dev/assert")) (home-page "https://atomicgo.dev/assert") (synopsis "Go package with tons of assertions") @@ -92,7 +91,7 @@ value and call @code{t.Fatal()} if the assertion fails.") (define-public go-github-com-alecthomas-assert-v2 (package (name "go-github-com-alecthomas-assert-v2") - (version "2.5.0") + (version "2.10.0") (source (origin (method git-fetch) @@ -101,11 +100,11 @@ value and call @code{t.Fatal()} if the assertion fails.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1ai26ncfcwzg47rqaigs5v1fzfz6i8p11ki75ni5429xkjs77riz")))) + (base32 "05jak1v9s2wrwrn6ar0s4388f7qg15q0qfmhfcswgl88720196z3")))) (build-system go-build-system) (arguments - (list #:go go-1.18 - #:import-path "github.com/alecthomas/assert/v2")) + (list + #:import-path "github.com/alecthomas/assert/v2")) (propagated-inputs (list go-github-com-alecthomas-repr go-github-com-hexops-gotextdiff)) @@ -620,7 +619,6 @@ differently.") (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/MarvinJWendt/testza" #:phases #~(modify-phases %standard-phases @@ -696,7 +694,6 @@ Gomega matcher library.") (base32 "1w5dldjjcz2kpyxml4zd9yah7galfpmhcpc2l4zc5pr3skpwpibv")))) (arguments (list - #:go go-1.20 #:import-path "github.com/onsi/ginkgo/v2")) (propagated-inputs (list go-github-com-go-logr-logr @@ -726,7 +723,6 @@ Gomega matcher library.") ;; Unless we disable the tests, we have a circular dependency on ;; ginkgo/v2. #:tests? #f - #:go go-1.21 #:import-path "github.com/onsi/gomega")) (propagated-inputs (list go-github-com-golang-protobuf @@ -758,7 +754,6 @@ framework.") (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/otiai10/mint")) (home-page "https://github.com/otiai10/mint") (synopsis "Minimal assertion for Golang testing framework") @@ -1229,7 +1224,6 @@ custom assertions to be used alongside native Go testing.") (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/warpfork/go-testmark")) (home-page "https://github.com/warpfork/go-testmark") (synopsis "Parser for @code{testmark} format") @@ -1258,7 +1252,6 @@ testmark} format, which itself is a subset of Markdown format.") (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/warpfork/go-wish")) (home-page "https://github.com/warpfork/go-wish") (synopsis "Test assertions for Golang") @@ -1314,7 +1307,6 @@ the end of a test.") ;; XXX: The project contains subdirectory which complicate it's testing ;; and it does not produce any binary. #:tests? #f - #:go go-1.20 #:import-path "go.uber.org/mock" #:phases #~(modify-phases %standard-phases @@ -1331,7 +1323,7 @@ built-in @code{testing} package, but can be used in other contexts too.") (define-public go-honnef-co-go-tools (package (name "go-honnef-co-go-tools") - (version "0.4.6") + (version "0.4.7") (source (origin (method git-fetch) @@ -1341,17 +1333,23 @@ built-in @code{testing} package, but can be used in other contexts too.") (file-name (git-file-name name version)) (sha256 (base32 - "0qikkhanmc0vrpgvs0c44y853n88m8qqsk08zry6mvm8f41pgjhi")))) + "1n58skq2a0vhsgdfdkyqi00d3vv13kiw9b4mxx6xfyb6ysrdy7d1")))) (build-system go-build-system) (arguments - `(#:import-path "honnef.co/go/tools" - #:tests? #f - ;; Source-only package - #:phases (modify-phases %standard-phases - (delete 'build)))) + (list + #:import-path "honnef.co/go/tools" + #:phases + #~(modify-phases %standard-phases + ;; XXX: Workaround for go-build-system's lack of Go modules support. + (delete 'build) + (replace 'check + (lambda* (#:key tests? import-path #:allow-other-keys) + (when tests? + (with-directory-excursion (string-append "src/" import-path) + (invoke "go" "test" "-v" "./...")))))))) (propagated-inputs (list go-github-com-burntsushi-toml - go-golang-org-x-exp + go-golang-org-x-exp-typeparams go-golang-org-x-mod go-golang-org-x-tools)) (home-page "https://staticcheck.dev/") @@ -1410,7 +1408,6 @@ thoroughly (name "ginkgo") (arguments (list - #:go go-1.20 #:import-path "github.com/onsi/ginkgo/ginkgo" #:unpack-path "github.com/onsi/ginkgo" #:install-source? #f)) @@ -1424,8 +1421,7 @@ tool.")))) (inherit go-honnef-co-go-tools) (name "go-keyify") (arguments - `(#:go ,go-1.20 - #:import-path "honnef.co/go/tools/cmd/keyify" + `(#:import-path "honnef.co/go/tools/cmd/keyify" #:unpack-path "honnef.co/go/tools" #:install-source? #f)) (synopsis "Transform an unkeyed struct literal into a keyed one in Go") @@ -1439,7 +1435,6 @@ tool.")))) (arguments (list #:install-source? #f - #:go go-1.19 #:import-path "github.com/google/pprof")) (description (string-append (package-description go-github-com-google-pprof) @@ -1451,8 +1446,7 @@ tool.")))) (inherit go-honnef-co-go-tools) (name "go-staticcheck") (arguments - `(#:go ,go-1.20 - #:import-path "honnef.co/go/tools/cmd/staticcheck" + `(#:import-path "honnef.co/go/tools/cmd/staticcheck" #:unpack-path "honnef.co/go/tools" #:install-source? #f)) (synopsis "Staticcheck advanced Go linter") @@ -1466,8 +1460,7 @@ simplifications, and enforces style rules."))) (inherit go-honnef-co-go-tools) (name "go-structlayout") (arguments - `(#:go ,go-1.20 - #:import-path "honnef.co/go/tools/cmd/structlayout" + `(#:import-path "honnef.co/go/tools/cmd/structlayout" #:unpack-path "honnef.co/go/tools" #:install-source? #f)) (synopsis "Display the layout (field sizes and padding) of structs in Go") @@ -1481,8 +1474,7 @@ flag."))) (inherit go-honnef-co-go-tools) (name "go-structlayout-optimize") (arguments - `(#:go ,go-1.20 - #:import-path "honnef.co/go/tools/cmd/structlayout-optimize" + `(#:import-path "honnef.co/go/tools/cmd/structlayout-optimize" #:unpack-path "honnef.co/go/tools" #:install-source? #f)) (synopsis "Reorder struct fields to minimize the amount of padding in Go") @@ -1495,8 +1487,7 @@ into @code{go-structlayout-pretty}."))) (inherit go-honnef-co-go-tools) (name "go-structlayout-pretty") (arguments - `(#:go ,go-1.20 - #:import-path "honnef.co/go/tools/cmd/structlayout-pretty" + `(#:import-path "honnef.co/go/tools/cmd/structlayout-pretty" #:unpack-path "honnef.co/go/tools" #:install-source? #f)) (synopsis "Format the output of go-structlayout with ASCII art in Go") diff --git a/gnu/packages/golang-compression.scm b/gnu/packages/golang-compression.scm index 67ae28abe5..be7af6f894 100644 --- a/gnu/packages/golang-compression.scm +++ b/gnu/packages/golang-compression.scm @@ -40,7 +40,7 @@ (define-public go-github-com-andybalholm-brotli (package (name "go-github-com-andybalholm-brotli") - (version "1.0.4") + (version "1.1.0") (source (origin (method git-fetch) @@ -49,7 +49,7 @@ (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1zvmj7gbnkq9xwv1bvcxk9acxl06y902148qwbd2kqwgs52wy2c0")))) + (base32 "1zdvcwfzxnkljyh4p7izy0bfxrwidwwmp1p5h1fydyrgbs4xacly")))) (build-system go-build-system) (arguments `(#:import-path "github.com/andybalholm/brotli")) @@ -218,6 +218,86 @@ library. This is beneficial for large amounts of data, say more than 1MB at a time, as otherwise the internal gzip library will likely be faster.") (license (list license:bsd-3 license:expat)))) +(define-public go-github-com-mholt-archiver-v3 + (package + (name "go-github-com-mholt-archiver-v3") + (version "3.5.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mholt/archiver") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1py186hfy4p69wghqmbsyi1r3xvw1nyl55pz8f97a5qhmwxb3mwp")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/mholt/archiver/v3")) + (propagated-inputs + (list go-github-com-andybalholm-brotli + go-github-com-dsnet-compress + go-github-com-golang-snappy + go-github-com-klauspost-compress + go-github-com-klauspost-pgzip + go-github-com-nwaples-rardecode + go-github-com-pierrec-lz4-v4 + go-github-com-ulikunitz-xz + go-github-com-xi2-xz)) + (home-page "https://github.com/mholt/archiver") + (synopsis "Multi format archiver Golang library and CLI commad") + (description + "Package archiver facilitates convenient, cross-platform, high-level +archival and compression operations for a variety of formats and compression +algorithms. + +Features: +@itemize +@item stream-oriented APIs +@item automatically identify archive and compression formats +@item traverse directories, archive files, and any other file uniformly as +@code{io/fs} file systems +@item compress and decompress files +@item create and extract archive files +@item walk or traverse into archive files +@item extract only specific files from archives +@item insert (append) into .tar and .zip archives +@item read from password-protected 7-Zip files +@item numerous archive and compression formats supported +@item extensible (add more formats just by registering them) +@item cross-platform, static binary +@item pure Golang (no cgo) +@item multithreaded Gzip +@item adjust compression levels +@item automatically add compressed files to zip archives without +re-compressing +@item open password-protected rar archives +@end itemize + +Supported compression formats: +@itemize +@item brotli (.br) +@item bzip2 (.bz2) +@item flate (.zip) +@item gzip (.gz) +@item lz4 (.lz4) +@item lzip (.lz) +@item snappy (.sz) +@item xz (.xz) +@item zlib (.zz) +@item zstandard (.zst) +@end itemize + +Supported archive formats: +@itemize +@item .zip +@item .tar (including any compressed variants like .tar.gz) +@item .rar (read-only) +@item .7z (read-only) +@end itemize") + (license license:expat))) + (define-public go-github-com-nwaples-rardecode (package (name "go-github-com-nwaples-rardecode") @@ -331,10 +411,52 @@ decompressing data. The package is completely written in Go and doesn't have any dependency on any C code.") (license license:bsd-3))) +(define-public go-github-com-xi2-xz + (package + (name "go-github-com-xi2-xz") + (version "0.0.0-20171230120015-48954b6210f8") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/xi2/xz") + (commit (go-version->git-ref version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "178r0fa2dpzxf0sabs7dn0c8fa7vs87zlxk6spkn374ls9pir7nq")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/xi2/xz")) + (home-page "https://github.com/xi2/xz") + (synopsis "Native Golang XZ decompression package") + (description + "This package implements a native XZ decompression in Golang.") + ;; This package is a modified version of XZ Embedded + ;; <http://tukaani.org/xz/embedded.html>: 0BSD + ;; + ;; The contents of the testdata directory are modified versions of the + ;; test files from XZ Utils <http://tukaani.org/xz/>: 0BSD + (license license:public-domain))) + ;;; ;;; Executables: ;;; +(define-public go-arc + (package + (inherit go-github-com-mholt-archiver-v3) + (name "go-arc") + (arguments + (list + #:install-source? #f + #:import-path "github.com/mholt/archiver/cmd/arc" + #:unpack-path "github.com/mholt/archiver")) + (description + (string-append (package-description go-github-com-mholt-archiver-v3) + "\nThis package provides an command line interface (CLI) +tool.")))) + (define-public go-lz4c (package (inherit go-github-com-pierrec-lz4-v4) diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm index ddeb79badf..3fbeac703b 100644 --- a/gnu/packages/golang-crypto.scm +++ b/gnu/packages/golang-crypto.scm @@ -63,10 +63,63 @@ ;;; ;;; Code: +;;; +;;; Libraries: +;;; + +(define-public go-c2sp-org-cctv-age + (package + (name "go-c2sp-org-cctv-age") + (version "0.0.0-20240306222714-3ec4d716e805") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/C2SP/CCTV") + (commit (go-version->git-ref version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "00bk05ca94lm3b029ycwj0krmg2gfjv1c3pc7dvq9gmwwzr564v5")) + (modules '((guix build utils))) + (snippet + #~(begin + ;; Sub folders containing different projects with their own + ;; licenses. + (for-each delete-file-recursively + (list "ML-KEM" "RFC6979" "ed25519" "jq255")))))) + (build-system go-build-system) + (arguments + (list + #:import-path "c2sp.org/CCTV/age" + #:unpack-path "c2sp.org/CCTV")) + (propagated-inputs + (list go-golang-org-x-crypto)) + (home-page "https://c2sp.org/CCTV/age") + (synopsis "Community Cryptography Test Vectors") + (description + "This package provides a large set of test vectors for the age file +encryption format, as well as a framework to easily generate them. + +The test suite can be applied to any age implementation, regardless of the +language it's implemented in, and the level of abstraction of its +interface. For the simplest, most universal integration, the implementation +can just attempt to decrypt the test files, check the operation only succeeds +if expect is success, and compare the decrypted payload. Test vectors +involving unimplemented features (such as passphrase encryption or armoring) +can be ignored.") + ;; age/internal/LICENSE: Redistribution and use in source and binary + ;; forms, with or without modification, are permitted provided that the + ;; following conditions are met + ;; + ;; age/README: The vectors in the testdata folder are available under the + ;; terms of the Zero-Clause BSD (reproduced below), CC0 1.0, or Unlicense + ;; license, to your choice. + (license license:cc0))) + (define-public go-filippo-io-age (package (name "go-filippo-io-age") - (version "1.1.1") + (version "1.2.0") (source (origin (method git-fetch) @@ -75,10 +128,41 @@ (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1k1dv1jkr72qpk5g363mhrg9hnf5c9qgv4l16l13m4yh08jp271d")))) + (base32 "1dms32lxqgjipmlisng7dmy1sdw0qscj43x9lmpadyzbzc64lhrv")))) (build-system go-build-system) - (arguments `(#:import-path "filippo.io/age")) - (inputs + (arguments + (list + #:import-path "filippo.io/age" + #:phases + #~(modify-phases %standard-phases + ;; FIXME: src/c2sp.org/CCTV/age/age.go:13:12: pattern testdata: + ;; cannot embed directory testdata: contains no embeddable files + ;; + ;; This happens due to Golang can't determine the valid directory of + ;; the module which is sourced during setup environment phase, but + ;; easy resolved after coping to expected directory "vendor" within + ;; the current package, see details in Golang source: + ;; + ;; - URL: <https://github.com/golang/go/blob/> + ;; - commit: 82c14346d89ec0eeca114f9ca0e88516b2cda454 + ;; - file: src/cmd/go/internal/load/pkg.go#L2059 + (add-before 'build 'copy-input-to-vendor-directory + (lambda* (#:key import-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-path) + (mkdir "vendor") + (copy-recursively + (string-append + #$(this-package-native-input "go-c2sp-org-cctv-age") + "/src/c2sp.org") + "vendor/c2sp.org")))) + (add-before 'install 'remove-vendor-directory + (lambda* (#:key import-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-path) + (delete-file-recursively "vendor"))))))) + (native-inputs + (list go-c2sp-org-cctv-age + go-github-com-rogpeppe-go-internal)) + (propagated-inputs (list go-golang-org-x-sys go-golang-org-x-term go-golang-org-x-crypto @@ -92,24 +176,6 @@ It features small explicit keys, no configuration options, and Unix-style composability.") (license license:bsd-3))) -(define-public age - (package - (inherit go-filippo-io-age) - (name "age") - (arguments - `(#:import-path "filippo.io/age/cmd/age" - #:unpack-path "filippo.io/age" - #:install-source? #f)))) - -(define-public age-keygen - (package - (inherit go-filippo-io-age) - (name "age-keygen") - (arguments - `(#:import-path "filippo.io/age/cmd/age-keygen" - #:unpack-path "filippo.io/age" - #:install-source? #f)))) - (define-public go-filippo-io-edwards25519 (package (name "go-filippo-io-edwards25519") @@ -575,9 +641,50 @@ RSA, RSA-PSS, and ECDSA, though hooks are present for adding your own.") (base32 "0px12zhdmzqjj5zlcr136rcsilpmi4chiz6arxv49q372j4nhmia")))) (arguments (list - #:go go-1.18 #:import-path "github.com/golang-jwt/jwt/v5")))) +(define-public go-github-com-google-go-tpm + (package + (name "go-github-com-google-go-tpm") + (version "0.9.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/google/go-tpm") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1c5j5cvwl45ka93nknmv454ivd7kp9n8yql19gr6z01z0s1ph7sg")))) + (build-system go-build-system) + (arguments + (list + #:go go-1.22 + #:import-path "github.com/google/go-tpm" + #:phases + #~(modify-phases %standard-phases + ;; XXX: Break cycle: + ;; github.com/google/go-tpm/tpm2/transport/simulator/simulator.go -> + ;; github.com/google/go-tpm-tools -> github.com/google/go-tpm. + ;; Consider to add required inputs on dependent package. + (delete 'build) + (delete 'check)))) + (home-page "https://github.com/google/go-tpm") + (synopsis "Go-TPM Legacy TPM 2.0 library") + (description + "This package provides a functionality to communicate directly with a +@acronym{Trusted Platform Module, TPM} device. The libraries don't implement +the entire spec for neither 1.2 nor 2.0. + +Included submodules: +@itemize +@item @code{tpm} - TPM 1.2 client library +@item @code{tpm2} - TPM 2.0 client library. +@item @code{direct} - the prototype \"TPMDirect\" TPM 2.0 API, which is +intended to (eventually) be 1:1 with the TPM 2.0 spec +@end itemize") + (license license:asl2.0))) + ;; It's not public for purpose, as it contains a lot of golang modules which ;; may be inherited from the single source, but the package itself does not ;; have to be installed directly or linked to other packages.. @@ -931,8 +1038,7 @@ Architecture Processors\" by J. Guilford et al.") (base32 "0ydh94083888xl2r4d1grzgqf3c818mkmdpj008jkh6h7m56wc4w")))) (build-system go-build-system) (arguments - (list #:go go-1.21 - #:import-path "github.com/multiformats/go-multihash" + (list #:import-path "github.com/multiformats/go-multihash" #:phases #~(modify-phases %standard-phases (add-after 'unpack 'copy-multibase-specs @@ -1052,7 +1158,7 @@ official package.") (define-public go-github-com-quic-go-qtls-go1-20 (package (name "go-github-com-quic-go-qtls-go1-20") - (version "0.3.4") + (version "0.4.1") (source (origin (method git-fetch) @@ -1061,12 +1167,13 @@ official package.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0fl3yv1w8cygag3lav45vvzb4k9i72p92x13wcq0xn13wxirzirn")))) + (base32 "069rknxpg7d0dmxc4akq2mw7wm5bi0420nshykf2iclvmbcg9ajh")))) (build-system go-build-system) (arguments (list - #:import-path "github.com/quic-go/qtls-go1-20" - #:go go-1.20)) + ;; XXX: panic: qtls.ClientSessionState doesn't match, with Golang 1.20+. + #:go go-1.20 + #:import-path "github.com/quic-go/qtls-go1-20")) (propagated-inputs (list go-golang-org-x-crypto go-golang-org-x-sys)) @@ -1092,7 +1199,6 @@ QUIC. For Go 1.20.") (build-system go-build-system) (arguments `(#:import-path "github.com/refraction-networking/utls" - #:go ,go-1.20 #:tests? #f)) ;requires internet access (propagated-inputs (list go-github-com-andybalholm-brotli @@ -1325,6 +1431,43 @@ performance for large inputs and outputs.") (description "GoPtLib is a library for writing Tor pluggable transports in Go.") (license license:cc0))) + +;;; +;;; Executables: +;;; + +(define-public age + (package + (inherit go-filippo-io-age) + (name "age") + (arguments + (list + #:install-source? #f + #:import-path "filippo.io/age/cmd/age" + #:unpack-path "filippo.io/age" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'remove-failing-test-data-files + ;; FIXME: testdata/output_file.txt:49: unknown command "ttyin" + ;; age: error: input and output file are the same: "inputcopy" + ;; age: error: input and output file are the same: "./inputcopy" + ;; age: error: input and output file are the same: "keycopy" + (lambda* (#:key import-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-path) + (for-each delete-file + (list "testdata/scrypt.txt" + "testdata/output_file.txt" + "testdata/encrypted_keys.txt" + "testdata/terminal.txt")))))))))) + +(define-public age-keygen + (package + (inherit go-filippo-io-age) + (name "age-keygen") + (arguments + `(#:import-path "filippo.io/age/cmd/age-keygen" + #:unpack-path "filippo.io/age" + #:install-source? #f)))) ;;; ;;; Avoid adding new packages to the end of this file. To reduce the chances diff --git a/gnu/packages/golang-maths.scm b/gnu/packages/golang-maths.scm index 2348255119..cf783226ea 100644 --- a/gnu/packages/golang-maths.scm +++ b/gnu/packages/golang-maths.scm @@ -1,4 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2024 Rodion Goritskov <rodion.goritskov@gmail.com> ;;; Copyright © 2024 Sharlatan Hellseher <sharlatanus@gmail.com> ;;; ;;; This file is part of GNU Guix. @@ -88,6 +89,33 @@ Features: @end itemize") (license license:expat))) +(define-public go-github-com-x448-float16 + (package + (name "go-github-com-x448-float16") + (version "0.8.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/x448/float16") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0qg6ya30fra20hpa2qzqqzs8l95lvw9yzd87fdzq195xqi6crb2l")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/x448/float16")) + (home-page "https://github.com/x448/float16") + (synopsis "Float16 (Binary16) in Golang") + (description + "This package provides a +@url{https://en.wikipedia.org/wiki/Half-precision_floating-point_format,IEEE +754 half-precision floating-point format (binary16)} with IEEE 754 default +rounding for conversions. IEEE 754-2008 refers to this 16-bit floating-point +format as binary16.") + (license license:expat))) + ;;; ;;; Executables: ;;; diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index e64f20801c..a9658cfbac 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -206,7 +206,6 @@ the parse trees produced by the html package.") (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/AudriusButkevicius/pfilter" #:phases #~(modify-phases %standard-phases @@ -561,8 +560,8 @@ and RFC 5389).") (base32 "1pwr7fzxgngb073q98qrz1f90bkk3pljynif6jl5a6q6kcsn7xf1")))) (build-system go-build-system) (arguments - (list #:go go-1.21 - #:import-path "github.com/cenkalti/backoff/v4")) + (list + #:import-path "github.com/cenkalti/backoff/v4")) (home-page "https://github.com/cenkalti/backoff") (synopsis "The exponential backoff algorithm in Go") (description "This is a Go port of the exponential backoff algorithm from @@ -787,7 +786,7 @@ decompose request handling into many smaller layers.") (define-public go-github-com-go-jose-go-jose-v3 (package (name "go-github-com-go-jose-go-jose-v3") - (version "3.0.0") + (version "3.0.3") (source (origin (method git-fetch) @@ -796,7 +795,7 @@ decompose request handling into many smaller layers.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1fnw0p49wc9gmd2xcji2x9jf97dgg9igagd5m6bmq3nw9jjfqdc5")))) + (base32 "0kbkplhzqv9ai28r4smhdsxxwh20d96srr3am37pwwnh48ivwch8")))) (build-system go-build-system) (arguments '( #:import-path "github.com/go-jose/go-jose/v3")) @@ -813,6 +812,24 @@ Signing and Encryption set of standards. This includes support for JSON Web Encryption, JSON Web Signature, and JSON Web Token standards.") (license license:asl2.0))) +(define-public go-github-com-go-jose-go-jose-v4 + (package + (inherit go-github-com-go-jose-go-jose-v3) + (name "go-github-com-go-jose-go-jose-v4") + (version "4.0.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/go-jose/go-jose") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1bf444687q5rdxjgk41bkryhzhx49f6600b7i51m572xdl0r28a9")))) + (arguments + (list + #:import-path "github.com/go-jose/go-jose/v4")))) + (define-public go-github-com-go-ldap-ldap (package (name "go-github-com-go-ldap-ldap") @@ -876,6 +893,114 @@ language.") "This package provides Golang bindings for the Telegram Bot API.") (license license:expat))) +(define-public go-github-com-go-webauthn-webauthn + (package + (name "go-github-com-go-webauthn-webauthn") + (version "0.10.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/go-webauthn/webauthn") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1jbx3cd8cr4aaqq9s1x4sd1rlcs3lmam5aavpl08s5rj18m7rivf")))) + (build-system go-build-system) + (arguments + (list + #:go go-1.22 + #:import-path "github.com/go-webauthn/webauthn" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'remove-failing-tests + (lambda* (#:key import-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-path) + (for-each delete-file + (list + ;; It tryes to access outbound network: + ;; + ;; Get "https://mds.fidoalliance.org": dial tcp: + ;; lookup mds.fidoalliance.org on [::1]:53: read udp + ;; [::1]:52300->[::1]:53: read: connection refused + ;; + ;; Post "https://mds3.fido.tools/getEndpoints": dial + ;; tcp: lookup mds3.fido.tools on [::1]:53: read udp + ;; [::1]:46703->[::1]:53: read: connection refused + "metadata/metadata_test.go" + ;; Get "https://mds.fidoalliance.org": dial tcp: + ;; lookup mds.fidoalliance.org on [::1]:53: read udp + ;; [::1]:37459->[::1]:53: read: connection refused + "protocol/attestation_androidkey_test.go" + "protocol/attestation_apple_test.go" + "protocol/attestation_packed_test.go" + "protocol/attestation_safetynet_test.go" + "protocol/attestation_test.go" + "protocol/attestation_tpm_test.go" + "protocol/attestation_u2f_test.go"))))) + ;; XXX: Run all tests, workaround for go-build-system's lack of Go + ;; modules support. + (delete 'build) + (replace 'check + (lambda* (#:key tests? import-path #:allow-other-keys) + (when tests? + (with-directory-excursion (string-append "src/" import-path) + (invoke "go" "test" "-v" "./...")))))))) + (native-inputs + (list go-github-com-stretchr-testify)) + (propagated-inputs + (list go-github-com-fxamacker-cbor-v2 + go-github-com-go-webauthn-x + go-github-com-golang-jwt-jwt-v5 + go-github-com-google-go-tpm + go-github-com-google-uuid + go-github-com-mitchellh-mapstructure)) + (home-page "https://github.com/go-webauthn/webauthn") + (synopsis "Webauthn/FIDO2 library for Golang") + (description + "This library is meant to handle @url{https://www.w3.org/TR/webauthn,Web +Authentication} for Go apps that wish to implement a passwordless solution for +users. This library conforms as much as possible to the guidelines and +implementation procedures outlined by the document. It's a successor of not +maintained https://github.com/duo-labs/webauthn library.") + (license license:bsd-3))) + +(define-public go-github-com-go-webauthn-x + (package + (name "go-github-com-go-webauthn-x") + (version "0.1.12") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/go-webauthn/x") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1h2ylzzh5xismgkz0gar3k8lwdwqqc2np4z5gmi1b5chh6qwy1bs")))) + (build-system go-build-system) + (arguments + (list + #:tests? #f ; no tests + #:import-path "github.com/go-webauthn/x" + #:phases + #~(modify-phases %standard-phases + ;; Source only package. + (delete 'build)))) + (propagated-inputs + (list go-golang-org-x-crypto)) + (home-page "https://github.com/go-webauthn/x") + (synopsis "Low level packages for WebAuthn") + (description + "This package implements a low level functionality for +@url{https://github.com/go-webauthn/webauthn,WebAuthn} library. It was forked +from CloudFlare's github.com/cloudflare/cfssl/revoke.") + (license (list + ;; For the CloudFlare's part: revoke/LICENSE. + license:bsd-2 + ;; For the WebAuthn's fork: LICENSE. + license:bsd-3)))) + (define-public go-github-com-goccy-go-json (package (name "go-github-com-goccy-go-json") @@ -947,8 +1072,11 @@ processes.") `(#:tests? #f ;application/octet-stream instead of text/plain #:import-path "github.com/google/go-github/v26/github" #:unpack-path "github.com/google/go-github/v26")) - (native-inputs - (list go-github-com-google-go-querystring go-golang-org-x-crypto)) + (propagated-inputs + (list go-github-com-google-go-querystring + go-golang-org-x-crypto + go-golang-org-x-oauth2 + go-golang-org-x-sync)) (home-page "https://github.com/google/go-github/") (synopsis "Client library for accessing the GitHub API v3") (description "@code{go-github} is a Go client library for accessing the @@ -1295,7 +1423,6 @@ JSON data to the machine.") (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/jackpal/gateway")) (native-inputs (list go-github-com-stretchr-testify)) @@ -1650,14 +1777,13 @@ following: (base32 "1rn02yn7494r7ayn585bbsddprbn8wdccxs4n2k5dmll4dyd39mp")))) (arguments (list - #:go go-1.21 #:import-path "github.com/multiformats/go-multiaddr")) (native-inputs (list go-github-com-stretchr-testify)) (propagated-inputs (list go-github-com-ipfs-go-cid go-github-com-multiformats-go-multibase go-github-com-multiformats-go-varint go-github-com-multiformats-go-multihash - go-golang-org-x-exp-2023)))) + go-golang-org-x-exp)))) (define-public go-github-com-multiformats-go-multiaddr-dns (package @@ -1675,7 +1801,6 @@ following: (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/multiformats/go-multiaddr-dns" #:unpack-path "github.com/multiformats/go-multiaddr-dns")) (propagated-inputs @@ -1703,7 +1828,6 @@ following: (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/multiformats/go-multiaddr-fmt")) (propagated-inputs (list go-github-com-multiformats-go-multiaddr-0.12)) @@ -1767,7 +1891,6 @@ conversion to and from @command{net.Addr}.") (build-system go-build-system) (arguments (list - #:go go-1.20 #:import-path "github.com/multiformats/go-multistream")) (propagated-inputs (list go-github-com-multiformats-go-varint)) @@ -1846,7 +1969,6 @@ which produce colorized output using github.com/fatih/color.") (arguments (list #:tests? #f ; Requires some unpackaged software and test data - #:go go-1.21 #:import-path "github.com/oschwald/geoip2-golang")) (propagated-inputs (list go-github-com-oschwald-maxminddb-golang)) @@ -1873,7 +1995,6 @@ databases in Go.") (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/oschwald/maxminddb-golang" #:phases #~(modify-phases %standard-phases @@ -1903,6 +2024,35 @@ used to read GeoLite2 and GeoIP2 databases, @code{geoip2} provides a higher-level API for doing so.") (license license:isc))) +(define-public go-github-com-pion-datachannel + (package + (name "go-github-com-pion-datachannel") + (version "1.5.8") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/pion/datachannel") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0v2xwrzvflrh1s8x6p1dj9h0hmxsp30h8whbl5p544r30rvsbnp2")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/pion/datachannel")) + (native-inputs + (list go-github-com-stretchr-testify)) + (propagated-inputs + (list go-github-com-pion-logging + go-github-com-pion-sctp + go-github-com-pion-transport-v3)) + (home-page "https://github.com/pion/datachannel") + (synopsis "Implementation of WebRTC Data Channels in Golang") + (description + "This package implements @code{WebRTC} Data Channels.") + (license license:expat))) + (define-public go-github-com-pion-dtls (package (name "go-github-com-pion-dtls") @@ -1951,7 +2101,6 @@ in Golang.") (base32 "10nn9349f7snqkzncda5m013fgnzicrcxi6pb6ghc0vb6rhqkf30")))) (arguments (list - #:go go-1.21 #:import-path "github.com/pion/dtls/v2")) (native-inputs (list go-github-com-stretchr-testify)) @@ -2028,7 +2177,6 @@ part of @url{https://github.com/pion, Pion} WebRTC implementation.") (arguments (list #:tests? #f ;Tests require network access. - #:go go-1.21 #:import-path "github.com/pion/ice/v2")) (propagated-inputs (list go-github-com-google-uuid @@ -2058,7 +2206,6 @@ part of @url{https://github.com/pion, Pion} WebRTC implementation.") (arguments (list #:tests? #f ;Tests require network access. - #:go go-1.21 #:import-path "github.com/pion/ice/v3")) (propagated-inputs (list go-github-com-google-uuid @@ -2091,7 +2238,6 @@ part of @url{https://github.com/pion, Pion} WebRTC implementation.") ;; packaging, see ;; <https://github.com/pion/.goassets/blob/master/.github/workflows/test.reusable.yml>. #:tests? #f - #:go go-1.21 #:unpack-path "github.com/pion/mdns" #:import-path "github.com/pion/mdns")) (native-inputs @@ -2145,7 +2291,6 @@ part of @url{https://github.com/pion, Pion} WebRTC implementation.") (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/pion/rtp")) (propagated-inputs (list go-github-com-pion-randutil)) @@ -2156,6 +2301,37 @@ part of @url{https://github.com/pion, Pion} WebRTC implementation.") packetizer and depacketizer.") (license license:expat))) +(define-public go-github-com-pion-sctp + (package + (name "go-github-com-pion-sctp") + (version "1.8.19") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/pion/sctp") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "19yzpyrlmk3gvpkpn5846rad9cc8ffxw9jqwnpr6szqax7k0l0zw")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/pion/sctp")) + (native-inputs + (list go-github-com-stretchr-testify)) + (propagated-inputs + (list go-github-com-pion-logging + go-github-com-pion-randutil + go-github-com-pion-transport-v3)) + (home-page "https://github.com/pion/sctp") + (synopsis "Implementation of SCTP in Golang") + (description + "This package implements the @acronym{Stream Control Transmission +Protocol,SCTP} as specified in +@uref{https://rfc-editor.org/rfc/rfc9260.html,RFC 9260}.") + (license license:expat))) + (define-public go-github-com-pion-stun (package (name "go-github-com-pion-stun") @@ -2172,7 +2348,6 @@ packetizer and depacketizer.") (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/pion/stun")) (native-inputs (list go-github-com-stretchr-testify)) @@ -2207,7 +2382,6 @@ packetizer and depacketizer.") (base32 "0zli55ls5izpr6cw0wj0gy44872xn9rk20i8ay9cfk7j2rb60y60")))) (arguments (list - #:go go-1.21 #:import-path "github.com/pion/stun/v2")) (propagated-inputs (list go-github-com-pion-dtls-v2 @@ -2401,7 +2575,6 @@ it like any library. The quickest way to get started is to look at the (build-system go-build-system) (arguments (list - #:go go-1.18 #:import-path "github.com/pires/go-proxyproto")) (home-page "https://github.com/pires/go-proxyproto") (synopsis "Implementation of the PROXY protocol") @@ -2510,7 +2683,6 @@ to jQuery to the Go language.") (list ;; Tests require ginkgo v2. #:tests? #f - #:go go-1.20 #:import-path "github.com/quic-go/qpack")) (propagated-inputs (list go-github-com-onsi-ginkgo @@ -2542,7 +2714,6 @@ the Go standard library}.") (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/quic-go/quic-go" #:phases #~(modify-phases %standard-phases @@ -2602,7 +2773,6 @@ protocol.") (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/quic-go/webtransport-go")) (native-inputs (list go-go-uber-org-mock @@ -2649,7 +2819,7 @@ support.") (define-public go-github-com-sourcegraph-jsonrpc2 (package (name "go-github-com-sourcegraph-jsonrpc2") - (version "0.1.0") + (version "0.2.0") (home-page "https://github.com/sourcegraph/jsonrpc2") (source (origin @@ -2659,14 +2829,12 @@ support.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1dk0w32k96vxrwnmm24wqx337dn8ylch65qwrbc3wh7whw2xx71q")))) + (base32 "1id35b4mhif9gy1b70mv0x7xkmpm2p8xydix8six10yjyhvm1wjh")))) (build-system go-build-system) (arguments '(#:import-path "github.com/sourcegraph/jsonrpc2")) (propagated-inputs - (list go-github-com-daviddengcn-go-colortext - go-github-com-gorilla-websocket - go-github-com-motemen-go-colorine)) + (list go-github-com-gorilla-websocket)) (synopsis "Provides a client and server implementation of JSON-RPC 2.0") (description "Package jsonrpc2 provides a Go implementation of JSON-RPC 2.0.") @@ -2848,6 +3016,68 @@ encoding library for the MessagePack, CBOR, JSON and the Binc formats.") replacement for native @code{net/http} module.") (license license:expat))) +(define-public go-github-com-whyrusleeping-cbor + (package + (name "go-github-com-whyrusleeping-cbor") + (version "0.0.0-20171005072247-63513f603b11") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/whyrusleeping/cbor") + (commit (go-version->git-ref version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0v3kgzk8grz17my2vhv12qi9dgpx3z86hy9ff1c4qw83mg8hm67s")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/whyrusleeping/cbor" + #:phases + #~(modify-phases %standard-phases + ;; XXX: Replace when go-build-system supports nested path. + (delete 'build) + (replace 'check + (lambda* (#:key import-path tests? #:allow-other-keys) + (when tests? + (with-directory-excursion (string-append "src/" import-path) + ;; No test vectors were provided with git checkout: + ;; var errpath string = "../test-vectors/appendix_a.json" + (substitute* "go/cbor_test.go" + (("TestDecodeVectors") "offTestDecodeVectors")) + (invoke "go" "test" "-v" "./...")))))))) + (home-page "https://github.com/whyrusleeping/cbor") + (synopsis "Concise Binary Object Representation in Golang") + (description + "@acronym{Concise Binary Object Representation,CBOR} is a superset of +JSON's schema that's faster and more compact.") + (license license:asl2.0))) + +(define-public go-github-com-whyrusleeping-chunker + (package + (name "go-github-com-whyrusleeping-chunker") + (version "0.0.0-20181014151217-fe64bd25879f") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/whyrusleeping/chunker") + (commit (go-version->git-ref version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "13q4flp9iwwyi0izqar786h42713rf3m22qlvg0masbmdi69qjr2")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/whyrusleeping/chunker")) + (home-page "https://github.com/whyrusleeping/chunker") + (synopsis "Implementation of Content Defined Chunking in Golang") + (description + "Package chunker implements @acronym{Content Defined Chunking,CDC} based +on a rolling Rabin Checksum. This package provides a modified fork of +https://github.com/restic/restic project.") + (license license:bsd-2))) + (define-public go-github-com-whyrusleeping-json-filter (let ((commit "ff25329a9528f01c5175414f16cc0a6a162a5b8b") (revision "0")) @@ -2873,6 +3103,33 @@ replacement for native @code{net/http} module.") @command{map[string]interface{}}.") (license license:expat)))) +(define-public go-github-com-whyrusleeping-multiaddr-filter + (package + (name "go-github-com-whyrusleeping-multiaddr-filter") + (version "0.0.0-20160516205228-e903e4adabd7") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/whyrusleeping/multiaddr-filter") + (commit (go-version->git-ref version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0ksd8vnp207dvphmhrazwldj8if900fnyc1pqa9pfvj04qp92640")))) + (build-system go-build-system) + (arguments + (list + ;; (*testing.common).Fatalf format %s has arg val of wrong type bool + #:tests? #f + #:import-path "github.com/whyrusleeping/multiaddr-filter")) + (home-page "https://github.com/whyrusleeping/multiaddr-filter") + (synopsis "Parsing ip filters and masks in the multiaddr format") + (description + "This module creates very simple +@url{https://github.com/jbenet/go-multiaddr,multiaddr} formatted cidr +netmasks.") + (license license:expat))) + (define-public go-github-com-xeipuuv-gojsonpointer (let ((commit "4e3ac2762d5f479393488629ee9370b50873b3a6") (revision "0")) @@ -2967,6 +3224,8 @@ programming language.") programming language, which supports draft-04, draft-06 and draft-07.") (license license:asl2.0)))) +;; XXX: This repository has been archived by the owner on Feb 27, 2023. It is +;; now read-only and it is DEPRECATED. (define-public go-gopkg-in-square-go-jose-v2 (package (name "go-gopkg-in-square-go-jose-v2") @@ -2982,7 +3241,12 @@ programming language, which supports draft-04, draft-06 and draft-07.") (base32 "1b1nhqxfmhzwrfk7pkvp2w3z3d0pf5ir00vizmy2d4xdbnldn70r")))) (build-system go-build-system) (arguments - (list #:import-path "gopkg.in/square/go-jose.v2")) + (list + ;; XXX: We strongly encourage users of square/go-jose to migrate to v3 + ;; of go-jose/go-jose. No support, security fixes or updates will be + ;; delivered to the v1/v2 branches in the Square repository. + #:tests? #f + #:import-path "gopkg.in/square/go-jose.v2")) (propagated-inputs (list go-golang-org-x-crypto)) (native-inputs diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index 54b9c45ed6..6560f43578 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -159,7 +159,6 @@ simulate (mock) keypresses for CI testing.") (build-system go-build-system) (arguments (list - #:go go-1.18 #:import-path "atomicgo.dev/schedule")) (home-page "https://atomicgo.dev/schedule") (synopsis "Easily schedule non-blocking tasks in Golang") @@ -186,7 +185,6 @@ given time, in a given duration, or repeatedly at a given interval.") (list ;; Tests require root access to mount file system. #:tests? #f - #:go go-1.19 #:import-path "bazil.org/fuse")) (propagated-inputs (list go-github-com-tv42-httpunix go-golang-org-x-sys)) @@ -217,7 +215,6 @@ use the C library from the project called FUSE.") (build-system go-build-system) (arguments (list - #:go go-1.20 #:import-path "code.cloudfoundry.org/bytefmt")) (native-inputs (list go-github-com-onsi-gomega @@ -274,7 +271,6 @@ a human-readable byte format.") ;; they may be sourced from sqlite package. (arguments (list - #:go go-1.21 #:import-path "git.sr.ht/~emersion/go-sqlite3-fts5" #:phases #~(modify-phases %standard-phases @@ -373,6 +369,31 @@ Golang.") substitution.") (license license:expat))) +(define-public go-github-com-abadojack-whatlanggo + (package + (name "go-github-com-abadojack-whatlanggo") + (version "1.0.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/abadojack/whatlanggo") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1pidd5dqvcnqjjka12h0clj3mmq0j3bpanf9153schsx85xz7mzx")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/abadojack/whatlanggo")) + (home-page "https://github.com/abadojack/whatlanggo") + (synopsis "Natural language detection library for Golang") + (description + "This package provides functionality for detecting natural languages and +scripts (writing systems). Languages are represented by a defined list of +constants, while scripts are represented by RangeTable.") + (license license:expat))) + (define-public go-github-com-adrg-strutil (package (name "go-github-com-adrg-strutil") @@ -473,7 +494,7 @@ syntax highlighted HTML, ANSI-coloured text, etc.") (package (inherit go-github-com-alecthomas-chroma) (name "go-github-com-alecthomas-chroma-v2") - (version "2.12.0") + (version "2.14.0") (source (origin (method git-fetch) @@ -482,16 +503,59 @@ syntax highlighted HTML, ANSI-coloured text, etc.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1j9zz77ppi4r4ncnanzj84h7bsg0qdqrhgd5kkjiv09afm31jx83")))) + (base32 "1qgr4gywjks869sc85wb8nby612b8wvsa1dwpsbanjsljq7wq7mp")))) (arguments - (list #:go go-1.19 - #:import-path "github.com/alecthomas/chroma/v2")) + (list + #:import-path "github.com/alecthomas/chroma/v2" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'remove-failing-testdata-and-cmd-files + (lambda* (#:key import-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-path) + (for-each delete-file-recursively + (list "lexers/testdata/python2/test_complex_file1.actual" + ;; Executible is packed as separate package. + "cmd"))))) + ;; XXX: Replace when go-build-system supports nested path. + (replace 'check + (lambda* (#:key import-path tests? #:allow-other-keys) + (when tests? + (with-directory-excursion (string-append "src/" import-path) + (invoke "go" "test" "-v" "./...")))))))) (propagated-inputs (list go-github-com-dlclark-regexp2)) (native-inputs (list go-github-com-alecthomas-assert-v2 go-github-com-alecthomas-repr)))) +(define-public go-github-com-alecthomas-colour + (package + (name "go-github-com-alecthomas-colour") + (version "0.1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/alecthomas/colour") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "10zbm12j40ppia4b5ql2blmsps5jhh5d7ffphxx843qk7wlbqnjb")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/alecthomas/colour")) + (native-inputs + (list go-github-com-mattn-go-isatty)) + (home-page "https://github.com/alecthomas/colour/") + (synopsis "Colour terminal text for Go") + (description + "Package colour provides Quake-style colour formatting for Unix +terminals. The package level functions can be used to write to stdout (or +strings or other files). If stdout is not a terminal, colour formatting will +be stripped.") + (license license:expat))) + (define-public go-github-com-alecthomas-kingpin (package (name "go-github-com-alecthomas-kingpin") @@ -543,6 +607,36 @@ syntax highlighted HTML, ANSI-coloured text, etc.") (native-inputs (list go-github-com-stretchr-testify)))) +(define-public go-github-com-alecthomas-kong + (package + (name "go-github-com-alecthomas-kong") + (version "0.9.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/alecthomas/kong") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0a9arf30h84ll8k612jh50c3vjmvdfj6i7dbvfnw3dalm6dn2aan")))) + (build-system go-build-system) + (arguments + (list + ;; One test failed when set to go-1.18 o lower, see + ;; <https://github.com/alecthomas/kong/issues/437> + #:import-path "github.com/alecthomas/kong")) + (native-inputs + (list go-github-com-alecthomas-assert-v2)) + (propagated-inputs + (list go-github-com-alecthomas-repr)) + (home-page "https://github.com/alecthomas/kong") + (synopsis "Command-line parser for Golang") + (description + "Package kong aims to support arbitrarily complex command-line structures +with as little developer effort as possible.") + (license license:expat))) + (define-public go-github-com-alecthomas-participle-v2 (package (name "go-github-com-alecthomas-participle-v2") @@ -558,8 +652,8 @@ syntax highlighted HTML, ANSI-coloured text, etc.") (base32 "0k2vsd58rgwyylyn5zja6z6k1sg4m39g2fhd88lvja60ca51bh98")))) (build-system go-build-system) (arguments - (list #:go go-1.18 - #:import-path "github.com/alecthomas/participle/v2")) + (list + #:import-path "github.com/alecthomas/participle/v2")) (native-inputs (list go-github-com-alecthomas-assert-v2)) (home-page "https://github.com/alecthomas/participle") @@ -571,6 +665,32 @@ structs. The approach is similar to how other marshallers work in Golang, \"unmarshalling\" an instance of a grammar into a struct.") (license license:expat))) +(define-public go-github-com-alecthomas-repr + (package + (name "go-github-com-alecthomas-repr") + (version "0.4.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/alecthomas/repr") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0ikvl78dighkn87bxk6gki4wcz9f138n7kbqkagj5vbdb690yjkl")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/alecthomas/repr")) + (native-inputs + (list go-github-com-stretchr-testify)) + (home-page "https://github.com/alecthomas/repr/") + (synopsis "Represent Go values in an almost direct form") + (description + "This package attempts to represent Go values in a form that can be used +almost directly in Go source code.") + (license license:expat))) + (define-public go-github-com-alecthomas-template ;; No release, see <https://github.com/alecthomas/template/issues/7>. (let ((commit "a0175ee3bccc567396460bf5acd36800cb10c49c") @@ -590,6 +710,10 @@ structs. The approach is similar to how other marshallers work in Golang, (build-system go-build-system) (arguments (list + ;; XXX: Failing on a newer Golang version: FAIL: TestJSEscaping + ;; (0.00s) exec_test.go:757: JS escaping [unprintable ﷿] got + ;; [unprintable ﷿] want [unprintable \uFDFF] + #:go go-1.17 #:import-path "github.com/alecthomas/template")) (home-page "https://github.com/alecthomas/template") (synopsis "Fork of Go's text/template adding newline elision") @@ -700,6 +824,30 @@ for generating command line clients for your application configuration that is stored in a Go struct.") (license license:mpl2.0))) +(define-public go-github-com-aymanbagabas-go-osc52-v2 + (package + (name "go-github-com-aymanbagabas-go-osc52-v2") + (version "2.0.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/aymanbagabas/go-osc52") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1y4y49zys7fi5wpicpdmjqnk0mb6569zg546km02yck2349jl538")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/aymanbagabas/go-osc52/v2")) + (home-page "https://github.com/aymanbagabas/go-osc52") + (synopsis "Terminal ANSI OSC52 wrapper") + (description + "OSC52 is a terminal escape sequence that allows copying text to the +clipboard.") + (license license:expat))) + (define-public go-github-com-benbjohnson-clock (package (name "go-github-com-benbjohnson-clock") @@ -715,8 +863,7 @@ stored in a Go struct.") (base32 "1p7n09pywqra21l981fbkma9vzsyf31pbvw6xg5r4hp8h8scf955")))) (build-system go-build-system) (arguments - `(#:import-path "github.com/benbjohnson/clock" - #:go ,go-1.21)) + `(#:import-path "github.com/benbjohnson/clock")) (home-page "https://github.com/benbjohnson/clock") (synopsis "Small library for mocking time in Go") (description @@ -1179,7 +1326,6 @@ submodules: (arguments (list #:tests? #t ; Tests require network interface access - #:go go-1.18 #:import-path "github.com/cskr/pubsub")) (home-page "https://github.com/cskr/pubsub") (synopsis "Simple pubsub package for go") @@ -1326,7 +1472,6 @@ gist (https://gist.github.com/kballard/272720).") (build-system go-build-system) (arguments (list - #:go go-1.20 #:import-path "github.com/dave/jennifer")) (home-page "https://github.com/dave/jennifer") (synopsis "Code generator for Go") @@ -1549,8 +1694,7 @@ Implements string conversion functionality for unit prefixes. "s := strconv.QuoteRune(rune(c))")))))) (build-system go-build-system) (arguments - `(#:import-path "github.com/dustin/gojson" - #:go ,go-1.21)) + `(#:import-path "github.com/dustin/gojson")) (home-page "https://github.com/dustin/gojson") (synopsis "Extended Golang's @code{encoding/json} module with the public scanner API") (description @@ -1660,7 +1804,6 @@ more similar API to regexp.")))) (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/expr-lang/expr")) (home-page "https://expr-lang.org/") (synopsis "Expression language and expression evaluation for Go") @@ -1670,6 +1813,41 @@ designed to deliver dynamic configurations with unparalleled accuracy, safety, and speed.") (license license:expat))) +(define-public go-github-com-facebookgo-atomicfile + (package + (name "go-github-com-facebookgo-atomicfile") + (version "0.0.0-20151019160806-2de1f203e7d5") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/facebookarchive/atomicfile") + (commit (go-version->git-ref version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1vsx6r6y601jxvjqc8msbpr5v1037dfxxdd8h1q3s8wm6xhvj2v6")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/facebookgo/atomicfile")) + (home-page "https://github.com/facebookgo/atomicfile") + (synopsis "Atomically written/replaced file") + (description + "Package atomicfile provides the ability to write a file with an eventual +rename on Close (using @code{os.Rename}). This allows for a file to always be +in a consistent state and never represent an in-progress write.") + ;; patents + ;; + ;; Additional Grant of Patent Rights Version 2 + ;; <...> + ;; Facebook, Inc. ("Facebook") hereby grants to each recipient of the + ;; Software ("you") a perpetual, worldwide, royalty-free, non-exclusive, + ;; irrevocable (subject to the termination provision below) license under + ;; any Necessary Claims, to make, have made, use, sell, offer to sell, + ;; import, and otherwise transfer the Software. + ;; <...> + (license license:bsd-3))) + (define-public go-github-com-facette-natsort (package (name "go-github-com-facette-natsort") @@ -1750,6 +1928,36 @@ quoting, commenting, and escaping.") (home-page "https://github.com/flynn-archive/go-shlex") (license license:asl2.0)))) +(define-public go-github-com-fxamacker-cbor-v2 + (package + (name "go-github-com-fxamacker-cbor-v2") + (version "2.7.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/fxamacker/cbor") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "039lk7n5155gy2sh55i1darcvxhv9fim2xmnvmx0xi9ihnrnczln")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/fxamacker/cbor/v2")) + (propagated-inputs + (list go-github-com-x448-float16)) + (home-page "https://github.com/fxamacker/cbor") + (synopsis "CBOR Codec in Golang") + (description + "This package implements functionality for encoding and decoding +@acronym{Concise Binary Object +Representation,CBOR} (@url{https://www.rfc-editor.org/rfc/rfc8949.html,RFC +8949}) and CBOR Sequences, with CBOR tags, Golang struct tags (@code{toarray}, +@code{keyasint}, @code{omitempty}), @code{float64/32/16}, and +@code{big.Intp}.") + (license license:expat))) + (define-public go-github-com-gabriel-vasile-mimetype (package (name "go-github-com-gabriel-vasile-mimetype") @@ -1766,7 +1974,6 @@ quoting, commenting, and escaping.") (build-system go-build-system) (arguments (list - #:go go-1.20 #:import-path "github.com/gabriel-vasile/mimetype" #:phases #~(modify-phases %standard-phases (add-before 'check 'add-supported-mimes-md @@ -1817,7 +2024,6 @@ Differentiation between text and binary files}. (build-system go-build-system) (arguments (list - #:go go-1.18 #:import-path "github.com/go-logr/logr" #:phases #~(modify-phases %standard-phases @@ -1916,6 +2122,56 @@ the library more lightweight.") "This package provides a Go implementation of globs.") (license license:expat))) +(define-public go-github-com-goccy-go-yaml + (package + (name "go-github-com-goccy-go-yaml") + (version "1.11.3") + (home-page "https://github.com/goccy/go-yaml") + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1rm2rfnlvv704zkb1mnjqv5xx32vfkzv7r2kc8if6gr9ryb7hmbf")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/goccy/go-yaml" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'remove-benchmarks + (lambda* (#:key import-path #:allow-other-keys) + (delete-file-recursively + (string-append "src/" import-path "/benchmarks")))) + ;; XXX: Replace when go-build-system supports nested path. + (replace 'check + (lambda* (#:key import-path tests? #:allow-other-keys) + (when tests? + (with-directory-excursion (string-append "src/" import-path) + (invoke "go" "test" "-v" "./...")))))))) + (native-inputs + (list go-github-com-go-playground-validator-v10 + go-github-com-google-go-cmp-cmp)) + (propagated-inputs + (list go-github-com-fatih-color + go-golang-org-x-xerrors)) + (synopsis "YAML support for the Go language") + (description + "This package provides features beyond the +@uref{https://github.com/go-yaml/yaml, defacto YAML library} including: + +@itemize +@item Pretty format for error notifications +@item Support Scanner or Lexer or Parser as public API +@item Support Anchor and Alias to Marshaler +@item Allow referencing elements declared in another file via anchors +@item Extract value or AST by YAMLPath (YAMLPath is like a JSONPath) +@end itemize") + (license license:expat))) + (define-public go-github-com-gookit-color (package (name "go-github-com-gookit-color") @@ -1932,7 +2188,6 @@ the library more lightweight.") (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/gookit/color" #:phases #~(modify-phases %standard-phases @@ -2181,7 +2436,6 @@ Groupcache.") (build-system go-build-system) (arguments (list - #:go go-1.18 #:import-path "github.com/hashicorp/golang-lru/v2")))) (define-public go-github-com-hashicorp-hcl @@ -2390,34 +2644,33 @@ and stop units of work, which may receive @code{Close} signals from many clients (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1hbpxcrcsbi975lklrhzyzk0fzn79pxicvfyf2sckmd2n6jb4ayy")))) + (base32 "1hbpxcrcsbi975lklrhzyzk0fzn79pxicvfyf2sckmd2n6jb4ayy")) + (modules '((guix build utils))) + (snippet + #~(begin + ;; Module name has been changed upstream. + (substitute* (find-files "." "\\.go$") + (("gopkg.in/neurosnap/sentences.v1") + "github.com/neurosnap/sentences")))))) (build-system go-build-system) (arguments (list - ;; FIXME: Adjust tests sute or check with upstram: - ;; === Failed - ;; === FAIL: nlp/segment TestGoldenRules (0.00s) - ;; segment_test.go:143: 25. Double quotations inside sentence - ;; segment_test.go:144: Actual: [She turned to him, "This is great." she said.] - ;; segment_test.go:145: Actual: 2, Expected: 1 - ;; segment_test.go:146: === - #:tests? #f - #:go go-1.21 #:import-path "github.com/jdkato/twine" #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'patch-module-import-path - (lambda* (#:key import-path #:allow-other-keys) + (add-after 'unpack 'disable-failing-tests + (lambda* (#:key tests? import-path #:allow-other-keys) (with-directory-excursion (string-append "src/" import-path) - (substitute* (find-files "." "\\.go$") - (("gopkg.in/neurosnap/sentences.v1") - "github.com/neurosnap/sentences"))))) - (replace 'build - (lambda* (#:key import-path #:allow-other-keys) - (with-directory-excursion (string-append "src/" import-path) - (invoke "go" "build" "-v" "-x" "-ldflags=-s -w" "-trimpath" "./..."))))))) - (native-inputs - (list gotestsum)) + (substitute* "nlp/segment/segment_test.go" + (("TestGoldenRules") "OffTestGoldenRules"))))) + ;; XXX: Workaround for go-build-system's lack of Go modules + ;; support. + (delete 'build) + (replace 'check + (lambda* (#:key tests? import-path #:allow-other-keys) + (when tests? + (with-directory-excursion (string-append "src/" import-path) + (invoke "go" "test" "-v" "./...")))))))) (propagated-inputs (list go-github-com-montanaflynn-stats go-github-com-neurosnap-sentences @@ -2801,7 +3054,6 @@ Printf/Sprintf etc.") (build-system go-build-system) (arguments (list - #:go go-1.19 #:import-path "github.com/logrusorgru/aurora/v3")) (native-inputs (list go-github-com-stretchr-testify)))) @@ -2857,7 +3109,6 @@ implementing features like: (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/Masterminds/semver/v3")) (native-inputs (list go-github-com-stretchr-testify-next)) @@ -3100,7 +3351,6 @@ the @code{cpan} module @code{Parse::CommandLine}.") (build-system go-build-system) (arguments (list - #:go go-1.19 #:import-path "github.com/mattn/go-sqlite3")) (home-page "https://github.com/mattn/go-sqlite3") (synopsis "Sqlite3 driver for Go") @@ -3369,7 +3619,6 @@ command line flags, config files, and default struct values.") (list ;; To run the full suite, the tests must be run as the root user. #:tests? #f - #:go go-1.20 #:import-path "github.com/msteinert/pam")) (propagated-inputs (list go-golang-org-x-term @@ -3467,7 +3716,6 @@ Authentication Modules, PAM} application API.") (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/multiformats/go-multibase" #:phases #~(modify-phases %standard-phases @@ -3507,7 +3755,6 @@ multibase} (self identifying base encodings) in Go.") (build-system go-build-system) (arguments (list - #:go go-1.19 #:import-path "github.com/multiformats/go-multicodec" #:phases #~(modify-phases %standard-phases @@ -3566,7 +3813,6 @@ varints.") (build-system go-build-system) (arguments (list - #:go go-1.20 #:import-path "github.com/nats-io/nats.go")) (propagated-inputs (list go-golang-org-x-text go-github-com-nats-io-nuid @@ -3649,7 +3895,6 @@ registry.") (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/neurosnap/sentences")) (home-page "https://github.com/neurosnap/sentences") (synopsis "Multilingual command line sentence tokenizer in Golang") @@ -3658,6 +3903,61 @@ registry.") list of sentences.") (license license:expat))) +(define-public go-github-com-niklasfasching-go-org + (package + (name "go-github-com-niklasfasching-go-org") + (version "1.7.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/niklasfasching/go-org") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "100ay19a7my2m1za1ih0wvqxf5mq77byas1f23mx69qsbp391w04")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/niklasfasching/go-org" + #:phases + #~(modify-phases %standard-phases + ;; FIXME: Pattern embedded: cannot embed directory embedded: + ;; contains no embeddable files. + ;; + ;; This happens due to Golang can't determine the valid directory of + ;; the module which is sourced during setup environment phase, but + ;; easy resolved after coping to expected directory "vendor" within + ;; the current package, see details in Golang source: + ;; + ;; - URL: <https://github.com/golang/go/blob/> + ;; - commit: 82c14346d89ec0eeca114f9ca0e88516b2cda454 + ;; - file: src/cmd/go/internal/load/pkg.go#L2059 + (add-before 'build 'copy-input-to-vendor-directory + (lambda* (#:key import-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-path) + (mkdir "vendor") + (copy-recursively + (string-append + #$(this-package-input "go-github-com-alecthomas-chroma-v2") + "/src/github.com") + "vendor/github.com")))) + (add-before 'install 'remove-vendor-directory + (lambda* (#:key import-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-path) + (delete-file-recursively "vendor"))))))) + (propagated-inputs + (list go-golang-org-x-net + go-github-com-pmezard-go-difflib + go-github-com-alecthomas-chroma-v2)) + (home-page "https://github.com/niklasfasching/go-org") + (synopsis "Org mode parser and render for Golang") + (description + "This package provides a library and CLI program to parse the +@code{org-mode} file format alongside a static site generator with HTML & +pretty printed rendering in Golang.") + (license license:expat))) + (define-public go-github-com-nsqio-go-diskqueue (package (name "go-github-com-nsqio-go-diskqueue") @@ -3799,7 +4099,6 @@ included in this package.") (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/otiai10/copy" #:phases #~(modify-phases %standard-phases @@ -3971,7 +4270,6 @@ Pion}.") ;; Cycle: go-github-com-pterm-pterm -> go-github-com-marvinjwendt-testza ;; -> go-github-com-pterm-pterm #:tests? #f - #:go go-1.21 #:import-path "github.com/pterm/pterm")) (propagated-inputs (list go-atomicgo-dev-cursor @@ -4138,7 +4436,6 @@ synchronizing plain text: (build-system go-build-system) (arguments (list - #:go go-1.18 #:import-path "github.com/shirou/gopsutil" #:phases #~(modify-phases %standard-phases (add-after 'unpack 'remove-v3 @@ -4182,7 +4479,6 @@ sensors).") (base32 "1xlfcx6giqaxdah2m02q2i8ynwlzar953wr8wqx1j3004xdgaivd")))) (arguments (list - #:go go-1.18 #:import-path "github.com/shirou/gopsutil" #:phases #~(modify-phases %standard-phases @@ -4258,10 +4554,9 @@ Use waterutil with it to work with TUN/TAP packets/frames.") ;; Package's tests appear to be hardcoded to the author's gitconfig ;; and require network access. #:tests? #f - #:go go-1.21 #:import-path "github.com/Songmu/gitconfig")) (propagated-inputs - (list go-github-com-goccy-yaml)) + (list go-github-com-goccy-go-yaml)) (home-page "https://github.com/songmu/gitconfig") (synopsis "Go library to get configuration values from gitconfig") (description @@ -4317,9 +4612,9 @@ well as a program to generate applications and command files.") (home-page "https://github.com/stathat/go") (license license:expat)))) -(define-public go-github-com-syndtr-goleveldb-leveldb +(define-public go-github-com-syndtr-goleveldb (package - (name "go-github-com-syndtr-goleveldb-leveldb") + (name "go-github-com-syndtr-goleveldb") (version "1.0.0") (source (origin @@ -4333,9 +4628,23 @@ well as a program to generate applications and command files.") (build-system go-build-system) (arguments (list - #:go go-1.21 - #:import-path "github.com/syndtr/goleveldb/leveldb" - #:unpack-path "github.com/syndtr/goleveldb")) + #:import-path "github.com/syndtr/goleveldb" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'disable-failing-tests + (lambda* (#:key tests? unpack-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" unpack-path) + (substitute* (find-files "." "\\_test.go$") + ;; XXX Failing on i686-linux: + ;; failed on input 0xde6d70588e18c85b, 0x85261e67 + (("TestBatchHeader") "OffTestBatchHeader"))))) + ;; XXX: Replace when go-build-system supports nested path. + (delete 'build) + (replace 'check + (lambda* (#:key import-path tests? #:allow-other-keys) + (when tests? + (with-directory-excursion (string-append "src/" import-path) + (invoke "go" "test" "-v" "./...")))))))) (propagated-inputs (list go-github-com-onsi-gomega go-github-com-onsi-ginkgo @@ -4510,7 +4819,6 @@ document.") (build-system go-build-system) (arguments (list - #:go go-1.18 #:import-path "github.com/tklauser/go-sysconf" #:phases #~(modify-phases %standard-phases (add-before 'check 'remove-failing-tests @@ -4547,7 +4855,6 @@ document.") (build-system go-build-system) (arguments (list - #:go go-1.18 #:import-path "github.com/tklauser/numcpus" #:phases #~(modify-phases %standard-phases (add-before 'check 'remove-failing-tests @@ -4650,6 +4957,57 @@ encoded values to create the picture in a code with no inherent errors.") weighted moving averages}.") (license license:expat))) +(define-public go-github-com-whyrusleeping-base32 + (package + (name "go-github-com-whyrusleeping-base32") + (version "0.0.0-20170828182744-c30ac30633cc") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/whyrusleeping/base32") + (commit (go-version->git-ref version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "060jj8j9rnm3m47vv7jfz9ddybch3ryvn1p9vhc63bqn73knalhf")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/whyrusleeping/base32")) + (home-page "https://github.com/whyrusleeping/base32") + (synopsis "BASE32 encoding package from go with NoPadding option") + (description + "This package provides a base32 encoding package from go with NoPadding +option.") + ;; No license provided, see + ;; <https://github.com/whyrusleeping/base32/issues/5> + (license license:public-domain))) + +(define-public go-github-com-whyrusleeping-go-keyspace + (package + (name "go-github-com-whyrusleeping-go-keyspace") + (version "0.0.0-20160322163242-5b898ac5add1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/whyrusleeping/go-keyspace") + (commit (go-version->git-ref version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0fkk7i7qxwbz1g621mm6a6inb69lr57cyc9ayyfiwhnjwfz78rbb")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/whyrusleeping/go-keyspace")) + (home-page "https://github.com/whyrusleeping/go-keyspace") + (synopsis "Comparing key metrics within a given keyspace") + (description + "This is a package extracted from @code{go-ipfs}. Its purpose to be used +to compare a set of keys based on a given metric. The primary metric used is +XOR, as in kademlia.") + (license license:expat))) + (define-public go-github-com-whyrusleeping-go-sysinfo (package (name "go-github-com-whyrusleeping-go-sysinfo") @@ -4798,7 +5156,6 @@ CPU quota.") (build-system go-build-system) (arguments (list - #:go go-1.20 #:import-path "go.uber.org/dig")) (native-inputs (list go-github-com-stretchr-testify-next)) @@ -4825,7 +5182,6 @@ object dependencies graph during the process startup.") (build-system go-build-system) (arguments (list - #:go go-1.20 #:import-path "go.uber.org/fx")) (native-inputs (list go-github-com-stretchr-testify-next)) @@ -4884,7 +5240,6 @@ applications out of reusable, composable modules.") (build-system go-build-system) (arguments (list - #:go go-1.19 #:import-path "go.uber.org/zap" #:phases #~(modify-phases %standard-phases @@ -4999,6 +5354,39 @@ values.") ;;; Executables: ;;; +(define-public go-chroma + (package + (name "go-chroma") + (version "2.14.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/alecthomas/chroma") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1qgr4gywjks869sc85wb8nby612b8wvsa1dwpsbanjsljq7wq7mp")))) + (build-system go-build-system) + (arguments + (list + #:install-source? #f + #:import-path "github.com/alecthomas/chroma/cmd/chroma")) + (native-inputs + (list go-github-com-alecthomas-assert-v2 + go-github-com-alecthomas-chroma-v2 + go-github-com-alecthomas-kong + go-github-com-mattn-go-colorable + go-github-com-mattn-go-isatty)) + (home-page "https://github.com/alecthomas/chroma") + (synopsis "General purpose syntax highlighter in pure Golang") + (description + (string-append (package-description go-github-com-alecthomas-chroma-v2) + " This package provides an command line interface (CLI) +tool.")) + (license license:asl2.0))) + (define-public go-hclogvet (package (inherit go-github-com-hashicorp-go-hclog) @@ -5021,7 +5409,6 @@ correctly."))) (name "go-numcpus") (arguments (list - #:go go-1.18 #:import-path "github.com/tklauser/numcpus/cmd/numcpus" #:unpack-path "github.com/tklauser/numcpus" #:install-source? #f)) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index d9145e9ac4..1298a8c58b 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -985,7 +985,10 @@ in the style of communicating sequential processes (@dfn{CSP}).") (list go-1.21) (package-native-inputs go-1.21))))) -(define-public go go-1.17) +;; +;; Default Golang version used in guix/build-system/go.scm to build packages. +;; +(define-public go go-1.21) (define make-go-std (mlambdaq (go) @@ -1734,32 +1737,32 @@ retry strategies, such as fixed delay, backoff delay, and random delay.") (description "Set is the set collection for the Go language.") (license license:expat))) -(define-public go-github-com-dhowett-go-plist - (let ((commit "1454fab16a0642638feb0ae98c41f79eccb2a20a") - (revision "1")) - (package - (name "go-github-com-dhowett-go-plist") - (version (git-version "0.0.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/DHowett/go-plist") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "01c9wmhny2rxywcjipq1xa0xw4qm7yd001239grwxcja3b4n45v8")))) - (build-system go-build-system) - (arguments `(#:import-path "howett.net/plist")) - (inputs - (list go-github-com-jessevdk-go-flags go-github-com-kr-pretty - go-gopkg-in-check-v1 go-gopkg-in-yaml-v2)) - (home-page "https://github.com/DHowett/go-plist") - (synopsis "Apple property list transcoder") - (description "This list transcoder supports encoding/decoding property -lists (Apple XML, Apple Binary, OpenStep, and GNUStep) from/to arbitrary Go -types.") - (license license:giftware)))) +(define-public go-howett-net-plist + (package + (name "go-howett-net-plist") + (version "1.0.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/DHowett/go-plist") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1gcrxkmdj87xq01458asgxvvijrkih74ydbzfmir1p16xr9z0x39")))) + (build-system go-build-system) + (arguments + (list + #:import-path "howett.net/plist")) + (propagated-inputs + (list go-github-com-jessevdk-go-flags + go-gopkg-in-check-v1)) + (home-page "https://github.com/DHowett/go-plist") + (synopsis "Apple property list transcoder") + (description + "This list transcoder supports encoding/decoding property lists (Apple +XML, Apple Binary, OpenStep, and GNUStep) from/to arbitrary Go types.") + (license license:giftware))) (define-public go-github-com-blanu-dust (package @@ -2227,7 +2230,6 @@ Go.") (arguments `(#:unpack-path "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/lyrebird" #:import-path "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/lyrebird/cmd/lyrebird" - #:go ,go-1.20 #:phases (modify-phases %standard-phases (add-after 'unpack 'substitutions @@ -2602,7 +2604,8 @@ mouse, and terminal resizing events.") (base32 "07d5kxz0f8ss3v46y0c8jg02sagi0wlaaijhjzzp0r462jyzqii7")))) (build-system go-build-system) (arguments - '(#:import-path "github.com/golangplus/fmt")) + '(#:tests? #f ; failing with new Golang compiler. + #:import-path "github.com/golangplus/fmt")) (synopsis "Additions to Go's standard @code{fmt} package") (description "This package provides additions to Go's stdlib @code{fmt}.") (license license:bsd-3))) @@ -2880,7 +2883,6 @@ web framework "0zff0qpqfzwa4xazppiq7jvpncnmx52m23qi4ih754b7rzhbk0iz")))) (arguments (list - #:go go-1.21 #:import-path "github.com/go-playground/validator/v10")) (propagated-inputs (modify-inputs (package-propagated-inputs @@ -3152,49 +3154,45 @@ command-line parsers.") (home-page "https://github.com/tj/docopt") (license license:expat))) -(define-public govulncheck +(define-public go-golang-org-x-vuln (package - (name "govulncheck") - (version "0.0.0-20221229164908-ebf31f7dc3ef") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://go.googlesource.com/vuln") - (commit (go-version->git-ref version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1w055g90k7anrrcvfrsqklxzl9pl0vqdiwpayj9f0brwys9xhj7d")))) + (name "go-golang-org-x-vuln") + ;; XXX: Newer version of govulncheck requires golang.org/x/telemetry, + ;; which needs to be discussed if it may be included in Guix. + (version "0.0.0-20230110180137-6ad3e3d07815") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://go.googlesource.com/vuln") + (commit (go-version->git-ref version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1fhz27ni8bs872rgvqq700qacak9v45zy0fh2hilq21sk6dks72r")))) (build-system go-build-system) (arguments - `(#:import-path "golang.org/x/vuln" - #:go ,go-1.19 - #:install-source? #f - #:phases ,#~(modify-phases %standard-phases - (add-after 'unpack 'remove-go-mod-tidy - (lambda _ - (substitute* "src/golang.org/x/vuln/checks.bash" - (("go mod tidy") - #$(file-append coreutils-minimal "/bin/true"))))) - (replace 'build - (lambda arguments - (apply (assoc-ref %standard-phases - 'build) - `(,@arguments #:import-path - "golang.org/x/vuln/cmd/govulncheck"))))))) - (native-inputs (list coreutils-minimal)) - (inputs (list go-golang-org-x-sys - go-github-com-google-renameio - go-github-com-burntsushi-toml - go-mvdan-cc-unparam - go-honnef-co-go-tools - go-golang-org-x-tools - go-golang-org-x-sync - go-golang-org-x-mod - go-golang-org-x-exp - go-github-com-google-go-cmp-cmp - go-github-com-google-go-cmdtest - go-github-com-client9-misspell)) + (list + #:tests? #f ; it tires to download modules from the network + #:import-path "golang.org/x/vuln" + #:phases + #~(modify-phases %standard-phases + ;; XXX: Workaround for go-build-system's lack of Go modules support. + (delete 'build) + (replace 'check + (lambda* (#:key tests? import-path #:allow-other-keys) + (when tests? + (with-directory-excursion (string-append "src/" import-path) + (invoke "go" "test" "-v" + "./doc/..." + "./internal/..." + "./scan/...")))))))) + (propagated-inputs + (list go-github-com-google-go-cmdtest + go-github-com-google-go-cmp-cmp + go-golang-org-x-exp + go-golang-org-x-mod + go-golang-org-x-sync + go-golang-org-x-tools)) (home-page "https://golang.org/x/vuln") (synopsis "Go Vulnerability Management") (description @@ -3202,58 +3200,60 @@ command-line parsers.") the @url{https://vuln.go.dev,Go Vulnerability Database}.") (license license:bsd-3))) -(define-public go-golang-org-x-vuln +(define-public govulncheck (package - (inherit govulncheck) - (name "go-golang-org-x-vuln") + (inherit go-golang-org-x-vuln) + (name "govulncheck") (arguments - `(#:import-path "golang.org/x/vuln" - #:tests? #f - #:install-source? #t - #:phases (modify-phases %standard-phases - (delete 'build)))) - (propagated-inputs (package-inputs govulncheck)) - (native-inputs '()) - (inputs '()))) + (list + #:tests? #f + #:install-source? #f + #:import-path "golang.org/x/vuln/cmd/govulncheck" + #:unpack-path "golang.org/x/vuln")) + (native-inputs + (list coreutils-minimal)))) (define-public gopls (package (name "gopls") - (version "0.12.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://go.googlesource.com/tools") - (commit (string-append "gopls/v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "04bq7rh6d6mgxm0lsi8y9v1x7cgx4nvjlsyvxl89r6rcqh3n1lfb")))) + ;; XXX: Starting from 0.14.0 gppls needs golang.org/x/telemetry, which + ;; needs to be discussed if it may be included in Guix. + (version "0.13.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://go.googlesource.com/tools") + (commit (string-append "gopls/v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1qym2c0xvv6vcgwh0kz8sw094r88lzrl08xpvmg08lrqi00ma6kx")))) (build-system go-build-system) (arguments - `(#:import-path "golang.org/x/tools/gopls" - #:unpack-path "golang.org/x/tools" - #:install-source? #f - #:phases (modify-phases %standard-phases - (add-before 'unpack 'override-tools - (lambda _ - (delete-file-recursively "src/golang.org/x/tools")))))) - (propagated-inputs (list go-github-com-google-go-cmp-cmp - go-github-com-jba-printsrc - go-github-com-jba-templatecheck - go-github-com-sergi-go-diff - go-golang-org-x-mod - go-golang-org-x-sync - go-golang-org-x-sys - go-golang-org-x-text - go-gopkg-in-yaml-v3 - go-honnef-co-go-tools - go-github-com-burntsushi-toml - go-github-com-google-safehtml - go-golang-org-x-exp - go-mvdan-cc-gofumpt - go-golang-org-x-vuln - go-mvdan-cc-xurls)) + (list + #:install-source? #f + #:import-path "golang.org/x/tools/gopls" + #:unpack-path "golang.org/x/tools" + #:phases + #~(modify-phases %standard-phases + (add-before 'unpack 'override-tools + (lambda _ + (delete-file-recursively "src/golang.org/x/tools")))))) + (native-inputs + (list go-github-com-google-go-cmp-cmp + go-github-com-jba-printsrc + go-github-com-jba-templatecheck + go-github-com-sergi-go-diff + go-golang-org-x-mod + go-golang-org-x-sync + go-golang-org-x-sys + go-golang-org-x-text + go-golang-org-x-tools + go-golang-org-x-vuln + go-gopkg-in-yaml-v3 + go-honnef-co-go-tools + go-mvdan-cc-gofumpt + go-mvdan-cc-xurls)) (home-page "https://golang.org/x/tools/gopls") (synopsis "Official language server for the Go language") (description @@ -3610,6 +3610,7 @@ GNU extensions} to the POSIX recommendations for command-line options.") (define-public go-github-com-spf13-viper (package (name "go-github-com-spf13-viper") + ;; Refreshing to a newer version requires long chain of missing packages. (version "1.7.0") (source (origin @@ -3624,6 +3625,7 @@ GNU extensions} to the POSIX recommendations for command-line options.") (build-system go-build-system) (arguments (list + #:tests? #f #:import-path "github.com/spf13/viper")) (propagated-inputs (list go-github-com-fsnotify-fsnotify @@ -4779,7 +4781,7 @@ cross-compilation.") (define-public go-github-com-mitchellh-mapstructure (package (name "go-github-com-mitchellh-mapstructure") - (version "1.1.2") ;; NOTE: Updating to 1.3.1 breaks tests on viper-1.7.0 + (version "1.5.0") (source (origin (method git-fetch) @@ -4789,7 +4791,7 @@ cross-compilation.") (file-name (git-file-name name version)) (sha256 (base32 - "03bpv28jz9zhn4947saqwi328ydj7f6g6pf1m2d4m5zdh5jlfkrr")))) + "10f2v143lkip8h46shd99k5yavfqpgqmd7a6y42v7szc0lcn3mff")))) (build-system go-build-system) (arguments `(#:import-path "github.com/mitchellh/mapstructure")) @@ -5276,7 +5278,7 @@ representation suitable for computing diffs.") (define-public go-github-com-go-sql-driver-mysql (package (name "go-github-com-go-sql-driver-mysql") - (version "1.5.0") + (version "1.8.1") (source (origin (method git-fetch) @@ -5286,11 +5288,13 @@ representation suitable for computing diffs.") (file-name (git-file-name name version)) (sha256 (base32 - "11x0m9yf3kdnf6981182r824psgxwfaqhn3x3in4yiidp0w0hk3v")))) + "0ihdqg411gkv454fwx8w5nbndgkm5dz5phfliksxgmhggyxxm7sn")))) (build-system go-build-system) (arguments '(#:tests? #f ;; tests require a network connection #:import-path "github.com/go-sql-driver/mysql")) + (propagated-inputs + (list go-filippo-io-edwards25519)) (home-page "https://github.com/go-sql-driver/mysql") (synopsis "MySQL driver for golang") (description @@ -5323,9 +5327,6 @@ It stores colors in RGB and provides methods for converting these to various color spaces.") (license license:expat))) -(define-public go-golang-org-colorful - (deprecated-package "go-golang-org-colorful" go-github-com-lucasb-eyer-go-colorful)) - (define-public go-github-com-gdamore-encoding (package (name "go-github-com-gdamore-encoding") @@ -5627,6 +5628,8 @@ designed to clean up raw terminal output by stripping escape sequences, optionally preserving color.") (license license:expat))) +;; XXX: This repository has been archived by the owner on Dec 1, 2021. It is +;; now read-only. (define-public go-github-com-pkg-errors (package (name "go-github-com-pkg-errors") @@ -5643,15 +5646,11 @@ optionally preserving color.") (build-system go-build-system) (arguments (list - #:import-path "github.com/pkg/errors" - #:phases - #~(modify-phases %standard-phases - (replace 'check - (lambda* (#:key inputs #:allow-other-keys #:rest args) - (unless - ;; The tests fail when run with gccgo. - (false-if-exception (search-input-file inputs "/bin/gccgo")) - (apply (assoc-ref %standard-phases 'check) args))))))) + ;; Tests fail with a newer version of Golang (1.21) due to some API + ;; changes in how the module path is calculated which is not reflected + ;; in tests. + #:tests? #f + #:import-path "github.com/pkg/errors")) (synopsis "Go error handling primitives") (description "This package provides @code{error}, which offers simple error handling primitives in Go.") @@ -6277,10 +6276,21 @@ data serialization format.") "1xf18kzz96hgfy1vlbnydrizzpxkqj2iamfdbj3dx5a1zz5mi8n0")))) (build-system go-build-system) (arguments - (list #:go go-1.21 - #:import-path "google.golang.org/protobuf" + (list #:import-path "google.golang.org/protobuf" #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'disable-failing-tests + (lambda* (#:key tests? unpack-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" unpack-path) + (substitute* (find-files "." "\\_test.go$") + ;; XXX Failing on i686-linux: + ;; panic: unaligned 64-bit atomic operation + (("TestDynamicTypesExtensionNotFound") + "OffTestDynamicTypesExtensionNotFound") + (("TestDynamicTypesFilesChangeAfterCreation") + "OffTestDynamicTypesFilesChangeAfterCreation") + (("TestDynamicTypesFindExtensionByNameOrNumber") + "OffTestDynamicTypesFindExtensionByNameOrNumber"))))) ;; XXX: Workaround for go-build-system's lack of Go modules ;; support. (delete 'build) @@ -6349,9 +6359,6 @@ efficient space usage.") (home-page "https://github.com/bits-and-blooms/bitset") (license license:bsd-3))) -(define-public go-github-com-willf-bitset - (deprecated-package "go-github-com-willf-bitset" go-github-com-bits-and-blooms-bitset)) - (define-public go-github-com-bits-and-blooms-bloom (package (name "go-github-com-bits-and-blooms-bloom") @@ -6386,9 +6393,6 @@ based on murmurhash.") (home-page "https://github.com/bits-and-blooms/bitset") (license license:bsd-2))) -(define-public go-github-com-willf-bloom - (deprecated-package "go-github-com-willf-bloom" go-github-com-bits-and-blooms-bloom)) - (define-public go-golang-org-rainycape-unidecode (let ((commit "cb7f23ec59bec0d61b19c56cd88cee3d0cc1870c") (revision "1")) @@ -6706,120 +6710,46 @@ matching and globbing with support for \"doublestar\" patterns.") (list #:import-path "github.com/bmatcuk/doublestar/v4")))) -(define-public go-github-com-alecthomas-colour - (package - (name "go-github-com-alecthomas-colour") - (version "0.1.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/alecthomas/colour") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "10zbm12j40ppia4b5ql2blmsps5jhh5d7ffphxx843qk7wlbqnjb")))) - (build-system go-build-system) - (arguments - `(#:import-path "github.com/alecthomas/colour")) - (native-inputs - (list go-github-com-mattn-go-isatty)) - (home-page "https://github.com/alecthomas/colour/") - (synopsis "Colour terminal text for Go") - (description "Package colour provides Quake-style colour formatting for -Unix terminals. - -The package level functions can be used to write to stdout (or strings or -other files). If stdout is not a terminal, colour formatting will be -stripped.") - (license license:expat))) - -(define-public go-github-com-alecthomas-repr - (package - (name "go-github-com-alecthomas-repr") - (version "0.3.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/alecthomas/repr") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1zq30b36vvg4kzxkff64gjwvcjaw0d13dqzfjfai66hkh3ijdzwl")))) - (build-system go-build-system) - (arguments - `(#:go ,go-1.18 - #:import-path "github.com/alecthomas/repr")) - (native-inputs - (list go-github-com-stretchr-testify)) - (home-page "https://github.com/alecthomas/repr/") - (synopsis "Represent Go values in an almost direct form") - (description "This package attempts to represent Go values in a form that -can be used almost directly in Go source code.") - (license license:expat))) - -(define-public go-github-com-muesli-reflow-wordwrap +(define-public go-github-com-muesli-reflow (package - (name "go-github-com-muesli-reflow-wordwrap") + (name "go-github-com-muesli-reflow") (version "0.3.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/muesli/reflow") - (commit (string-append "v" version)))) - (file-name (git-file-name "go-github-com-muesli-reflow" version)) - (sha256 - (base32 - "09zcz2cqdwgj1ilya5pqwndryk6lansn87x63fcm8j1xn74vd2ry")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/muesli/reflow") + (commit (string-append "v" version)))) + (file-name (git-file-name "go-github-com-muesli-reflow" version)) + (sha256 + (base32 "09zcz2cqdwgj1ilya5pqwndryk6lansn87x63fcm8j1xn74vd2ry")))) (build-system go-build-system) (arguments - `(#:import-path "github.com/muesli/reflow/wordwrap" - #:unpack-path "github.com/muesli/reflow")) - (native-inputs + (list + #:import-path "github.com/muesli/reflow" + #:phases + #~(modify-phases %standard-phases + ;; XXX: Workaround for go-build-system's lack of Go modules + ;; support. + (delete 'build) + (replace 'check + (lambda* (#:key tests? import-path #:allow-other-keys) + (when tests? + (with-directory-excursion (string-append "src/" import-path) + (invoke "go" "test" "-v" "./...")))))))) + (propagated-inputs (list go-github-com-mattn-go-runewidth)) (home-page "https://github.com/muesli/reflow/") (synopsis "Collection of methods helping to transform blocks of text") - (description "This package provides a collection of ANSI-aware methods and -io.Writers helping you to transform blocks of text.") + (description + "This package provides a collection of ANSI-aware methods and io.Writers +helping you to transform blocks of text.") (license license:expat))) -(define-public go-github-com-muesli-reflow-ansi - (package - (inherit go-github-com-muesli-reflow-wordwrap) - (name "go-github-com-muesli-reflow-ansi") - (arguments - `(#:import-path "github.com/muesli/reflow/ansi" - #:unpack-path "github.com/muesli/reflow")))) - -(define-public go-github-com-muesli-reflow-indent - (package - (inherit go-github-com-muesli-reflow-wordwrap) - (name "go-github-com-muesli-reflow-indent") - (arguments - `(#:import-path "github.com/muesli/reflow/indent" - #:unpack-path "github.com/muesli/reflow")))) - -(define-public go-github-com-muesli-reflow-padding - (package - (inherit go-github-com-muesli-reflow-wordwrap) - (name "go-github-com-muesli-reflow-padding") - (arguments - `(#:import-path "github.com/muesli/reflow/padding" - #:unpack-path "github.com/muesli/reflow")))) - -(define-public go-github-com-muesli-reflow-truncate - (package - (inherit go-github-com-muesli-reflow-wordwrap) - (name "go-github-com-muesli-reflow-truncate") - (arguments - `(#:import-path "github.com/muesli/reflow/truncate" - #:unpack-path "github.com/muesli/reflow")))) - (define-public go-github-com-muesli-termenv (package (name "go-github-com-muesli-termenv") - (version "0.8.1") + (version "0.15.2") (source (origin (method git-fetch) (uri (git-reference @@ -6828,15 +6758,16 @@ io.Writers helping you to transform blocks of text.") (file-name (git-file-name name version)) (sha256 (base32 - "0m24ljq1nq7z933fcvg99fw0fhxj9rb5ll4rlay7z2f2p59mrbdp")))) + "19yhli6k79aqpra4djp0cl4q76mqxbc1f7in20y0dzhnjb7yz42p")))) (build-system go-build-system) (arguments `(#:import-path "github.com/muesli/termenv")) - (native-inputs - (list go-github-com-google-goterm + (propagated-inputs + (list go-github-com-aymanbagabas-go-osc52-v2 go-github-com-lucasb-eyer-go-colorful go-github-com-mattn-go-isatty - go-github-com-mattn-go-runewidth)) + go-github-com-mattn-go-runewidth + go-golang-org-x-sys)) (home-page "https://github.com/muesli/termenv/") (synopsis "Advanced styling options on the terminal") (description "termenv lets you safely use advanced styling options on the @@ -6914,7 +6845,7 @@ size of the terminal.") (define-public go-github-com-charmbracelet-glamour (package (name "go-github-com-charmbracelet-glamour") - (version "0.2.0") + (version "0.7.0") (source (origin (method git-fetch) (uri (git-reference @@ -6923,43 +6854,56 @@ size of the terminal.") (file-name (git-file-name name version)) (sha256 (base32 - "1idq8d13rp1hx2a1xak31fwl9fmi09p2x4ymvzl7aj850saw5w0z")))) + "073kyx94r9f0hpjv5c3x9pfdd3dbpyqcy7jhx4yxz0ps25j1a41p")))) (build-system go-build-system) (arguments - (list #:import-path "github.com/charmbracelet/glamour" - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'patch-tests - (lambda _ - ;; Some tests fail due to different number of '^[0m' symbols at - ;; the beginning and the end of paragraphs. To fix that we - ;; re-generate 'readme.test' so the test output will match the - ;; 'readme.test' contents. - (chmod "src/github.com/charmbracelet/glamour/testdata/readme.test" - #o644) - (substitute* "src/github.com/charmbracelet/glamour/glamour_test.go" - ((" generate = false") - " generate = true"))))))) - (native-inputs - (list go-github-com-alecthomas-chroma - go-github-com-danwakefield-fnmatch - go-github-com-dlclark-regexp2 + (list + #:import-path "github.com/charmbracelet/glamour" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-tests + (lambda _ + ;; Some tests fail due to different number of '^[0m' symbols at + ;; the beginning and the end of paragraphs. To fix that we + ;; re-generate 'readme.test' so the test output will match the + ;; 'readme.test' contents. + (chmod "src/github.com/charmbracelet/glamour/testdata/readme.test" + #o644) + (substitute* "src/github.com/charmbracelet/glamour/glamour_test.go" + ((" generate = false") + " generate = true")))) + ;; FIXME: Pattern embedded: cannot embed directory embedded: + ;; contains no embeddable files. + ;; + ;; This happens due to Golang can't determine the valid directory of + ;; the module which is sourced during setup environment phase, but + ;; easy resolved after coping to expected directory "vendor" within + ;; the current package, see details in Golang source: + ;; + ;; - URL: <https://github.com/golang/go/blob/> + ;; - commit: 82c14346d89ec0eeca114f9ca0e88516b2cda454 + ;; - file: src/cmd/go/internal/load/pkg.go#L2059 + (add-before 'build 'copy-input-to-vendor-directory + (lambda* (#:key import-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-path) + (mkdir "vendor") + (copy-recursively + (string-append + #$(this-package-input "go-github-com-alecthomas-chroma-v2") + "/src/github.com") + "vendor/github.com")))) + (add-before 'install 'remove-vendor-directory + (lambda* (#:key import-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-path) + (delete-file-recursively "vendor"))))))) + (propagated-inputs + (list go-github-com-alecthomas-chroma-v2 go-github-com-microcosm-cc-bluemonday - go-github-com-chris-ramon-douceur - go-github-com-aymerick-douceur - go-github-com-gorilla-css - go-github-com-muesli-reflow-ansi - go-github-com-muesli-reflow-wordwrap - go-github-com-muesli-reflow-indent - go-github-com-muesli-reflow-padding - go-github-com-mattn-go-runewidth + go-github-com-muesli-reflow go-github-com-muesli-termenv - go-github-com-google-goterm - go-github-com-lucasb-eyer-go-colorful - go-github-com-mattn-go-isatty go-github-com-olekukonko-tablewriter go-github-com-yuin-goldmark - go-golang-org-x-net)) + go-github-com-yuin-goldmark-emoji)) (home-page "https://github.com/charmbracelet/glamour/") (synopsis "Write handsome command-line tools with glamour") (description "@code{glamour} lets you render markdown documents and @@ -7405,9 +7349,9 @@ and @code{ioutil} packages that is easy to test.") @code{go-github-com-twpayne-go-vfs} and @code{go-github-com-spf13-afero}.") (license license:expat))) -(define-public go-github-com-twpayne-go-xdg +(define-public go-github-com-twpayne-go-xdg-v3 (package - (name "go-github-com-twpayne-go-xdg") + (name "go-github-com-twpayne-go-xdg-v3") (version "3.1.0") (source (origin (method git-fetch) @@ -7683,7 +7627,7 @@ server tools for Prometheus metrics.") (arguments `(#:tests? #f ;XXX: Fix dbus tests #:import-path "github.com/zalando/go-keyring")) - (native-inputs + (propagated-inputs (list go-github-com-godbus-dbus dbus)) (home-page "https://github.com/zalando/go-keyring/") (synopsis "Library for working with system keyring") @@ -7869,7 +7813,10 @@ additions.") "09a4gsh75a8bj71wr042afrma9frriqp60cm0cx6c9a8lv5yzzi0")))) (build-system go-build-system) (arguments - '(#:import-path "golang.zx2c4.com/wireguard")) + '(;; XXX: Failed on newer version of Golang, the recent release requires + ;; gvisor.dev/gvisor, which is huge to pack. + #:tests? #f + #:import-path "golang.zx2c4.com/wireguard")) (propagated-inputs (list go-golang-org-x-crypto go-golang-org-x-net go-golang-org-x-sys go-golang-org-x-text)) @@ -7904,49 +7851,6 @@ systems can import this package to enable running programs as services without modifying them.") (license license:zlib))) -(define-public go-github-com-goccy-yaml - (package - (name "go-github-com-goccy-yaml") - (version "1.11.3") - (home-page "https://github.com/goccy/go-yaml") - (source - (origin - (method git-fetch) - (uri (git-reference - (url home-page) - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1rm2rfnlvv704zkb1mnjqv5xx32vfkzv7r2kc8if6gr9ryb7hmbf")))) - (build-system go-build-system) - (arguments - (list - #:go go-1.18 - #:import-path "github.com/goccy/go-yaml" - #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'remove-benchmarks - (lambda* (#:key import-path #:allow-other-keys) - (delete-file-recursively - (string-append "src/" import-path "/benchmarks"))))))) - (propagated-inputs - (list go-github-com-fatih-color go-golang-org-x-xerrors)) - (native-inputs - (list go-github-com-go-playground-validator-v10 - go-github-com-google-go-cmp-cmp)) - (synopsis "YAML support for the Go language") - (description - "This package provides features beyond the -@uref{https://github.com/go-yaml/yaml, defacto YAML library} including: - -@itemize -@item Pretty format for error notifications -@item Support Scanner or Lexer or Parser as public API -@item Support Anchor and Alias to Marshaler -@item Allow referencing elements declared in another file via anchors -@item Extract value or AST by YAMLPath (YAMLPath is like a JSONPath) -@end itemize") - (license license:expat))) - (define-public go-github-com-tekwizely-go-parsing (let ((commit "1548cfb17df54d365ce9febed0677c06a40a8ceb") (revision "0")) @@ -8139,8 +8043,7 @@ Gemini clients and servers.") fixed-version)))))) (build-system go-build-system) (arguments - `(#:import-path "mvdan.cc/gofumpt" - #:go ,go-1.19)) + `(#:import-path "mvdan.cc/gofumpt")) (native-inputs (list go-gopkg-in-errgo-fmt-errors)) (propagated-inputs (list go-github-com-pkg-diff go-github-com-kr-text @@ -8177,7 +8080,7 @@ That is, @code{gofumpt} is happy with a subset of the formats that (define-public unparam (package (name "unparam") - (version "0.0.0-20221223090309-7455f1af531d") + (version "0.0.0-20240528143540-8a5130ca722f") (source (origin (method git-fetch) (uri (git-reference @@ -8186,13 +8089,16 @@ That is, @code{gofumpt} is happy with a subset of the formats that (file-name (git-file-name name version)) (sha256 (base32 - "0wynf0b32azxljncw5fh9bwkxpdflvf9q1z16wyj432566yjh12c")))) + "0qrwszcmb5slbzkq3acw57b896z22zwkv6cf6ldxwlc6p179g009")))) (build-system go-build-system) (arguments - `(#:import-path "mvdan.cc/unparam" - #:go ,go-1.19)) - (inputs (list go-golang-org-x-sys go-golang-org-x-mod - go-github-com-pkg-diff go-golang-org-x-tools + `(;; FIXME: <...>-go-1.21.5/lib/go/src/runtime/cgo/cgo.go:33:8: could not + ;; import C (no metadata for C) + ;; <...>-go-1.21.5/lib/go/src/net/cgo_linux.go:12:8: could not import C + ;; (no metadata for C) + #:tests? #f + #:import-path "mvdan.cc/unparam")) + (inputs (list go-github-com-pkg-diff go-golang-org-x-tools go-github-com-rogpeppe-go-internal)) (home-page "https://mvdan.cc/unparam/") (synopsis "Find unused parameters in Go") @@ -8515,11 +8421,9 @@ parser.") `(("github.com/mattn/go-isatty" ,go-github-com-mattn-go-isatty) ("github.com/muesli/termenv" ,go-github-com-muesli-termenv) ("github.com/mattn/go-runewidth" ,go-github-com-mattn-go-runewidth) - ("go-github-com-muesli-reflow-indent" ,go-github-com-muesli-reflow-indent) - ("go-github-com-muesli-reflow-ansi" ,go-github-com-muesli-reflow-ansi) + ("go-github-com-muesli-reflow" ,go-github-com-muesli-reflow) ("go-github-com-lucasb-eyer-go-colorful" ,go-github-com-lucasb-eyer-go-colorful) ("github.com/containerd/console" ,go-github-com-containerd-console) - ("go-github-com-muesli-reflow-truncate" ,go-github-com-muesli-reflow-truncate) ("go-golang-org-x-crypto" ,go-golang-org-x-crypto) ("go-golang-org-x-sys" ,go-golang-org-x-sys) ("go-golang-org-x-term" ,go-golang-org-x-term) @@ -8575,7 +8479,6 @@ dependencies and a simple API.") (build-system go-build-system) (arguments (list #:import-path "github.com/Arceliar/ironwood" - #:go go-1.21 #:tests? #f #:phases #~(modify-phases %standard-phases @@ -8618,9 +8521,6 @@ be useful for other network applications.") (home-page "https://github.com/mtibben/percent") (license license:expat))) -(define-public go-github-com-percent - (deprecated-package "go-github-com-percent" go-github-com-mtibben-percent)) - (define-public aws-vault (package (name "aws-vault") @@ -8727,9 +8627,6 @@ aware of your profiles and configuration in ~/.aws/config.") (home-page "https://github.com/gsterjov/go-libsecret") (license license:expat)))) -(define-public go-github-com-go-libsecret - (deprecated-package "go-github-com-go-libsecret" go-github-com-gsterjov-go-libsecret)) - (define-public go-github-com-mtibben-androiddnsfix (let ((commit "ff02804463540c36e3a148dcf4b009d003cf2a31") (revision "0")) @@ -8984,8 +8881,7 @@ ordered, mutable data structure.") (base32 "0pdy8f7bkm65gx4vknwcvfa619hknflqxkdlvmf427k2mzm91gmh")))) (build-system go-build-system) (arguments - `(#:import-path "github.com/peterbourgon/diskv" - #:go ,go-1.18)) + `(#:import-path "github.com/peterbourgon/diskv")) (propagated-inputs (list go-github-com-google-btree)) (home-page "https://github.com/peterbourgon/diskv") (synopsis "Disk-backed key-value store") @@ -9129,7 +9025,7 @@ text-only mail clients to display them.") (define-public go-github-com-jhillyerd-enmime (package (name "go-github-com-jhillyerd-enmime") - (version "0.9.4") + (version "1.2.0") (source (origin (method git-fetch) (uri (git-reference @@ -9138,22 +9034,19 @@ text-only mail clients to display them.") (file-name (git-file-name name version)) (sha256 (base32 - "124dqm598phbmalyx2gmxk201z9kq4ckvvdq8rc0akjlp24nxqbb")))) + "03pir9wq9ha2i2ifj819yv5i0lvrgdn904ksbzgc3k8bqc497ydn")))) (build-system go-build-system) (arguments (list #:import-path "github.com/jhillyerd/enmime")) - (propagated-inputs (list go-golang-org-x-text - go-golang-org-x-net - go-github-com-stretchr-testify - go-github-com-ssor-bom - go-github-com-rivo-uniseg - go-github-com-pkg-errors - go-github-com-olekukonko-tablewriter - go-github-com-mattn-go-runewidth - go-github-com-gogs-chardet - go-github-com-jaytaylor-html2text - go-github-com-go-test-deep - go-github-com-cention-sany-utf7)) + (native-inputs + (list go-github-com-stretchr-testify)) + (propagated-inputs (list + go-github-com-cention-sany-utf7 + go-github-com-go-test-deep + go-github-com-gogs-chardet + go-github-com-jaytaylor-html2text + go-github-com-pkg-errors + go-golang-org-x-text)) (home-page "https://github.com/jhillyerd/enmime") (synopsis "MIME encoder and decoder for Go") (description diff --git a/gnu/packages/gps.scm b/gnu/packages/gps.scm index 09a419d7e9..ebb7eed99c 100644 --- a/gnu/packages/gps.scm +++ b/gnu/packages/gps.scm @@ -31,6 +31,7 @@ #:use-module (guix git-download) #:use-module (guix build-system gnu) #:use-module (guix build-system scons) + #:use-module (guix build-system qt) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix utils) #:use-module (gnu packages) @@ -51,6 +52,7 @@ #:use-module (gnu packages qt) #:use-module (gnu packages serialization) #:use-module (gnu packages sqlite) + #:use-module (gnu packages xdisorg) #:use-module (gnu packages xml)) (define-public gpsbabel @@ -179,33 +181,31 @@ coordinates as well as partial support for adjustments in global coordinate syst (define-public gpxsee (package (name "gpxsee") - (version "11.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/tumic0/GPXSee") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1klpjiqsvpvhlg5hsfjaszsyqr817hig9r7y7w4cp0kyn8z5fzfj")))) - (build-system gnu-build-system) + (version "13.22") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tumic0/GPXSee") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "15m5rqky2fwsq5n6x531350x39wwhpv1hz56m1yfaxj7acxhb2p5")))) + (build-system qt-build-system) (arguments - '(#:phases - (modify-phases %standard-phases - (replace 'configure - ;; Use lrelease to convert TS translation files into QM files. - (lambda* (#:key inputs outputs #:allow-other-keys) - (for-each (lambda (file) - (invoke "lrelease" file)) - (find-files "lang" "\\.ts")) - (invoke "qmake" - (string-append "PREFIX=" - (assoc-ref outputs "out")))))))) - (inputs - (list qtbase-5 qtlocation qtsvg-5)) - (native-inputs - (list qttools-5)) + (list + #:qtbase qtbase + #:tests? #f ; no tests + #:phases #~(modify-phases %standard-phases + (replace 'configure + ;; Use lrelease to convert TS translation files into QM files. + (lambda _ + (apply invoke "lrelease" + (find-files "lang" "\\.ts")) + (invoke "qmake" + (string-append "PREFIX=" #$output))))))) + (inputs (list libxkbcommon qtbase qtpositioning qtserialport qtsvg)) + (native-inputs (list qttools)) (home-page "https://www.gpxsee.org") (synopsis "GPS log file viewer and analyzer") (description diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 2a1d66dbbd..8eae1ed89d 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -496,14 +496,14 @@ typically encountered in feature film production.") (define-public blender (package (name "blender") - (version "3.6.10") ;3.6.x is the current LTS version + (version "3.6.13") ;3.6.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 - "1srwr365y40hhpjmfsg52rphdybvin0ay2r23pknm7b9pkpw0wqs")))) + "1sx2yz1y37h8g2p6k8cjf2935p3nlvn9nvjc9yfzp79bg4ypfpbz")))) (build-system cmake-build-system) (arguments (list @@ -1325,16 +1325,17 @@ with strong support for multi-part, multi-channel use cases.") (define-public openimageio (package (name "openimageio") - (version "2.5.10.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/OpenImageIO/oiio") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "06x3lqj9qjh5m0zbr5g2g9ii6jk340pgzrhr4fb353y1y2pkx5sw")))) + (version "2.5.13.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/AcademySoftwareFoundation/OpenImageIO") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0bqalfcfjjk31a7zv2hyx0jz8jpdhpsmc3sqwmfl4zf431g45hpb")))) (build-system cmake-build-system) (arguments (list #:tests? #f ; half the tests require online data or use redirection @@ -1344,14 +1345,22 @@ with strong support for multi-part, multi-channel use cases.") (list pkg-config)) (inputs (list boost + dcmtk fmt + freetype giflib imath + libglvnd libheif libjpeg-turbo libpng + libraw libtiff + libwebp + opencolorio openexr + openjpeg + ;; openvdb ; OpenVDB needs OIIO to be built with C++17 or higher pugixml pybind11 python-wrapper @@ -1363,7 +1372,7 @@ with strong support for multi-part, multi-channel use cases.") related classes, utilities, and applications. There is a particular emphasis on formats and functionality used in professional, large-scale animation and visual effects work for film.") - (home-page "https://www.openimageio.org") + (home-page "https://github.com/AcademySoftwareFoundation/OpenImageIO") (license license:bsd-3))) (define-public openscenegraph @@ -2351,8 +2360,8 @@ Automated palette selection is supported.") (list extra-cmake-modules pkg-config)) (inputs (list giflib - karchive - kdnssd + karchive-5 + kdnssd-5 libmicrohttpd libsodium libvpx diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 56763cd835..fb10351849 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -2970,7 +2970,7 @@ Unix desktop environment under X11 as well as Wayland.") (define-public webp-pixbuf-loader (package (name "webp-pixbuf-loader") - (version "0.0.4") + (version "0.2.4") (source (origin (method git-fetch) @@ -2979,7 +2979,7 @@ Unix desktop environment under X11 as well as Wayland.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1kshsz91mirjmnmv796nba1r8jg8a613anhgd38dhh2zmnladcwn")))) + (base32 "0dsdkw0i8fg3051653zmz68s068a2w23d708av64afzvav1xvhv0")))) (build-system meson-build-system) (arguments (list diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 5ef51e27a9..3ce4f6a8d6 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -2718,8 +2718,7 @@ many readers as needed).") (guix build utils)) #:imported-modules ((guix build guile-build-system) ,@%gnu-build-system-modules) - #:configure-flags (list "--with-ncursesw" ; Unicode support - "--with-gnu-filesystem-hierarchy") + #:configure-flags (list "--with-gnu-filesystem-hierarchy") #:phases (modify-phases %standard-phases (add-before 'build 'fix-libguile-ncurses-file-name diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm index 3fce4f803c..90047795c1 100644 --- a/gnu/packages/haskell-apps.scm +++ b/gnu/packages/haskell-apps.scm @@ -37,6 +37,7 @@ (define-module (gnu packages haskell-apps) #:use-module (guix download) + #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (guix packages) #:use-module ((guix licenses) #:prefix license:) @@ -682,6 +683,98 @@ By operating at a lower level than most similar tools, it supports X11, Wayland, and Linux console environments alike.") (license license:expat)))) +(define-public matterhorn + (package + (name "matterhorn") + (version "90000.0.0") + (source + (origin + ;; use git repo instead of hackage URL because the hackage tarball + ;; doesn't contain the sample config file + (method git-fetch) + (uri (git-reference + (url "https://github.com/matterhorn-chat/matterhorn") + (commit version))) + (sha256 + (base32 "08ng5axranilvfl9j3v0mjgpg76kzacrqj4c8x6pblpc3yxx02i5")))) + (build-system haskell-build-system) + (properties '((upstream-name . "matterhorn"))) + (inputs (list ghc-aeson + ghc-aspell-pipe + ghc-async + ghc-base-compat + ghc-bimap + ghc-brick + ghc-brick-skylighting + ghc-commonmark + ghc-commonmark-extensions + ghc-config-ini + ghc-crypton-connection + ghc-data-clist + ghc-gitrev + ghc-hashable + ghc-hclip + ghc-mattermost-api + ghc-microlens-platform + ghc-network-uri + ghc-random + ghc-semigroups + ghc-skylighting-core + ghc-split + ghc-stm-delay + ghc-strict + ghc-temporary + ghc-text-zipper + ghc-timezone-olson + ghc-timezone-series + ghc-unix-compat-7 + ghc-unordered-containers + ghc-utf8-string + ghc-uuid + ghc-vector + ghc-vty-6 + ghc-vty-crossplatform + ghc-word-wrap + ghc-xdg-basedir)) + (native-inputs (list ghc-checkers + ghc-mattermost-api-qc + ghc-tasty + ghc-tasty-hunit + ghc-tasty-quickcheck + ghc-unique)) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-requirements + (lambda _ + (for-each (lambda (dep) + (substitute* "matterhorn.cabal" + (((string-append "(,\\s" dep + "\\s*>=\\s[0-9].[0-9]).*") + all pat) + pat))) + (list "random" + "data-clist" + "semigroups" + "word-wrap" + "unix-compat" + "skylighting-core" + "checkers" + "vty" + "vty-crossplatform" + "brick")))) + (add-after 'install 'install-config-file + (lambda _ + (install-file "./docs/sample-config.ini" + (string-append #$output "/share/doc/" + #$name "-" #$version "/etc/"))))))) + (home-page "https://hackage.haskell.org/package/matterhorn") + (synopsis "Terminal client for the Mattermost chat system") + (description + "This is a terminal client for the Mattermost chat system.") + (license license:bsd-3))) + (define-public nixfmt (package (name "nixfmt") diff --git a/gnu/packages/haskell-crypto.scm b/gnu/packages/haskell-crypto.scm index 83ba8bc10b..7ea9cf1e12 100644 --- a/gnu/packages/haskell-crypto.scm +++ b/gnu/packages/haskell-crypto.scm @@ -612,6 +612,144 @@ AES-NI available, or you'll need to use a different implementation.") abstraction for CPRNGs.") (license license:bsd-3))) +(define-public ghc-crypton + (package + (name "ghc-crypton") + (version "0.34") + (source + (origin + (method url-fetch) + (uri (hackage-uri "crypton" version)) + (sha256 + (base32 "1mhypjhzn95in853bp7ary0a2xc6lsji6j8hrrgn2mfa4ilq8i24")))) + (build-system haskell-build-system) + (properties '((upstream-name . "crypton"))) + (inputs (list ghc-memory ghc-basement)) + (native-inputs (list ghc-tasty ghc-tasty-quickcheck ghc-tasty-hunit + ghc-tasty-kat)) + (home-page "https://github.com/kazu-yamamoto/crypton") + (synopsis "Cryptography Primitives sink") + (description + "This package provides a repository of cryptographic primitives. + +@itemize @bullet +@item Symmetric ciphers: AES, DES, 3DES, CAST5, Blowfish, Twofish, Camellia, + RC4, Salsa, XSalsa, ChaCha. +@item Hash: SHA1, SHA2, SHA3, SHAKE, MD2, MD4, MD5, Keccak, Skein, Ripemd, + Tiger, Whirlpool, Blake2. +@item MAC: HMAC, KMAC, Poly1305 +@item Asymmetric crypto: DSA, RSA, DH, ECDH, ECDSA, ECC, Curve25519, Curve448, + Ed25519, Ed448 +@item Key Derivation Function: PBKDF2, Scrypt, HKDF, Argon2, BCrypt, + BCryptPBKDF +@item Cryptographic Random generation: System Entropy, Deterministic Random + Generator +@item Data related: Anti-Forensic Information Splitter (AFIS) +@end itemize") + (license license:bsd-3))) + +(define-public ghc-crypton-x509 + (package + (name "ghc-crypton-x509") + (version "1.7.6") + (source + (origin + (method url-fetch) + (uri (hackage-uri "crypton-x509" version)) + (sha256 + (base32 "1zyaz0krf08g36g30zr5wn8f2x51l4dj2zcjnhpiw9h05p54mdzb")))) + (build-system haskell-build-system) + (properties '((upstream-name . "crypton-x509"))) + (inputs (list ghc-memory + ghc-hourglass + ghc-pem + ghc-asn1-types + ghc-asn1-encoding + ghc-asn1-parse + ghc-crypton)) + (native-inputs (list ghc-tasty ghc-tasty-quickcheck ghc-x509)) + (arguments + `(#:cabal-revision ("1" + "10a2x47znhbayyfr6fqgq27623akpycyjbfxz4hnavavf1x6ary5") + ;; build phase fails when tests are activated. + ;; See https://github.com/kazu-yamamoto/crypton-certificate/pull/7 + #:tests? #f)) + (home-page "https://github.com/kazu-yamamoto/crypton-certificate") + (synopsis "X509 reader and writer") + (description "This package provides generic X509 support for Haskell.") + (license license:bsd-3))) + +(define-public ghc-crypton-x509-store + (package + (name "ghc-crypton-x509-store") + (version "1.6.9") + (source + (origin + (method url-fetch) + (uri (hackage-uri "crypton-x509-store" version)) + (sha256 + (base32 "0vr5b9cyf9x016wn1g0bryslf5nz8jq2sy8r3llwqfg02apihqiy")))) + (build-system haskell-build-system) + (properties '((upstream-name . "crypton-x509-store"))) + (inputs (list ghc-pem ghc-asn1-types ghc-asn1-encoding ghc-crypton + ghc-crypton-x509)) + (native-inputs (list ghc-tasty ghc-tasty-hunit)) + (home-page "https://github.com/kazu-yamamoto/crypton-certificate") + (synopsis "X.509 collection accessing and storing methods") + (description + "This package provides methods for accessing and storing X.509 +collections of certificates, certificate revocation lists, and exception +lists.") + (license license:bsd-3))) + +(define-public ghc-crypton-x509-system + (package + (name "ghc-crypton-x509-system") + (version "1.6.7") + (source + (origin + (method url-fetch) + (uri (hackage-uri "crypton-x509-system" version)) + (sha256 + (base32 "1jilnr9715njlx1hqvg5lrsrwk12r04maypmh18di0sybwg2cdm4")))) + (build-system haskell-build-system) + (properties '((upstream-name . "crypton-x509-system"))) + (inputs (list ghc-pem ghc-crypton-x509 ghc-crypton-x509-store)) + (home-page "https://github.com/kazu-yamamoto/crypton-certificate") + (synopsis "Handle per-operating-system X.509 accessors and storage") + (description + "This package provides tools for operating system dependent X.509 stores, +storage methods, and accessors.") + (license license:bsd-3))) + +(define-public ghc-crypton-x509-validation + (package + (name "ghc-crypton-x509-validation") + (version "1.6.12") + (source + (origin + (method url-fetch) + (uri (hackage-uri "crypton-x509-validation" version)) + (sha256 + (base32 "1xjhwvmkcy47a6xiqxb3xy944ca7g660203jdrz5xzd46zibfq0f")))) + (build-system haskell-build-system) + (properties '((upstream-name . "crypton-x509-validation"))) + (inputs (list ghc-memory + ghc-hourglass + ghc-data-default-class + ghc-pem + ghc-asn1-types + ghc-asn1-encoding + ghc-crypton-x509 + ghc-crypton-x509-store + ghc-crypton)) + (native-inputs (list ghc-tasty ghc-tasty-hunit)) + (home-page "https://github.com/kazu-yamamoto/crypton-certificate") + (synopsis "X.509 Certificate and CRL validation") + (description "This package provides Haskell tools for X.509 certificate +and @dfn{Certificates revocation list} (CRL) validation.") + (license license:bsd-3))) + (define-public ghc-cprng-aes (package (name "ghc-cprng-aes") @@ -721,6 +859,43 @@ Ephemeral (Elliptic curve and regular) Diffie Hellman key exchanges, and many extensions.") (license license:bsd-3))) +(define-public ghc-tls-1.9 + (package + (name "ghc-tls") + (version "1.9.0") + (source + (origin + (method url-fetch) + (uri (hackage-uri "tls" version)) + (sha256 + (base32 "0gj3af9sqd0bw7dpcqfyvbslpxsk2ij00a77kl710fwhw35vj1an")))) + (build-system haskell-build-system) + (properties '((upstream-name . "tls"))) + (inputs (list ghc-cereal + ghc-data-default-class + ghc-memory + ghc-crypton + ghc-asn1-types + ghc-asn1-encoding + ghc-crypton-x509 + ghc-crypton-x509-store + ghc-crypton-x509-validation + ghc-async + ghc-unix-time + ghc-network)) + (native-inputs (list ghc-tasty ghc-tasty-quickcheck ghc-quickcheck)) + (home-page "https://github.com/haskell-tls/hs-tls") + (synopsis "TLS/SSL protocol native implementation (server and client)") + (description + "This package provides a native Haskell TLS and SSL protocol +implementation for server and client. It provides a high-level implementation +of a sensitive security protocol, eliminating a common set of security issues +through the use of the advanced type system, high level constructions and +common Haskell features. It currently implements the SSL3.0, TLS1.0, TLS1.1 +and TLS1.2 protocol, and supports RSA and Ephemeral (Elliptic curve and +regular) Diffie Hellman key exchanges, and many extensions.") + (license license:bsd-3))) + (define-public ghc-hsopenssl (package (name "ghc-hsopenssl") diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index 0aaa609e42..540b167b7a 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -89,6 +89,36 @@ for screen-scraping.") (description "HTTP cookie parsing and rendering library for Haskell.") (license license:expat))) +(define-public ghc-crypton-connection + (package + (name "ghc-crypton-connection") + (version "0.3.2") + (source + (origin + (method url-fetch) + (uri (hackage-uri "crypton-connection" version)) + (sha256 + (base32 "07lrkv6lwphsyp4797yp8ywnndzd270bk58r8gwyby0hr4xy52r0")))) + (build-system haskell-build-system) + (properties '((upstream-name . "crypton-connection"))) + (inputs (list ghc-basement + ghc-data-default-class + ghc-network + ghc-tls-1.9 + ghc-socks + ghc-crypton-x509 + ghc-crypton-x509-store + ghc-crypton-x509-system + ghc-crypton-x509-validation)) + (home-page "https://github.com/kazu-yamamoto/crypton-connection") + (synopsis "Simple and easy network connections API") + (description + "This package provides a simple network library for all your connection +needs. Features: Really simple to use, SSL/TLS, SOCKS. This library provides +a very simple API to create sockets to a destination with the choice of +SSL/TLS, and SOCKS.") + (license license:bsd-3))) + (define-public ghc-curl (package (name "ghc-curl") @@ -814,6 +844,67 @@ attacks.") Haskell.") (license license:bsd-3))) +(define-public ghc-mattermost-api + (package + (name "ghc-mattermost-api") + (version "90000.0.0") + (source + (origin + (method url-fetch) + (uri (hackage-uri "mattermost-api" version)) + (sha256 + (base32 "1ka3r4bnfwlbjnkws8vkg8i9gj8wzsyss137p7hxrx4sr75s6iyv")))) + (build-system haskell-build-system) + (properties '((upstream-name . "mattermost-api"))) + (inputs (list ghc-websockets + ghc-aeson + ghc-crypton-connection + ghc-memory + ghc-resource-pool + ghc-http + ghc-http-media + ghc-network-uri + ghc-modern-uri + ghc-unordered-containers + ghc-hashable + ghc-gitrev + ghc-microlens + ghc-microlens-th + ghc-pretty-show + ghc-split + ghc-connection)) + (native-inputs (list ghc-tasty ghc-tasty-hunit ghc-hunit)) + (arguments + (list #:tests? #f)) ;tests require networking and Mattermost Docker image + (home-page "https://hackage.haskell.org/package/mattermost-api") + (synopsis "Client API for Mattermost chat system") + (description + "This package implements the client API for the Mattermost chat system. +Mattermost is a flexible messaging platform. This library provides network +API interaction with the Mattermost server.") + (license license:bsd-3))) + +(define-public ghc-mattermost-api-qc + (package + (name "ghc-mattermost-api-qc") + (version "90000.0.0") + (source + (origin + (method url-fetch) + (uri (hackage-uri "mattermost-api-qc" version)) + (sha256 + (base32 "0lrb8l8nbrdp4y2ala8hchr8ikv5hqw710ffiiw1sz6z2dqiqbxm")))) + (build-system haskell-build-system) + (properties '((upstream-name . "mattermost-api-qc"))) + (inputs (list ghc-mattermost-api ghc-quickcheck)) + (home-page "https://github.com/matterhorn-chat/mattermost-api-qc") + (synopsis "QuickCheck instances for the Mattermost client API library") + (description + "This package provides a library providing @code{QuickCheck} for the +mattermost-api library to allow testing. This is provided as a separate +library to allow use of the API library without testing dependencies.") + (license license:isc))) + (define-public ghc-mime-types (package (name "ghc-mime-types") @@ -832,6 +923,36 @@ Haskell.") "This library provides basic MIME type handling types and functions.") (license license:expat))) +(define-public ghc-modern-uri + (package + (name "ghc-modern-uri") + (version "0.3.6.1") + (source + (origin + (method url-fetch) + (uri (hackage-uri "modern-uri" version)) + (sha256 + (base32 "1sag8l91qd7xs56rlx8r6dz9zxxmqsnfw0v47az7l8nirv7zjih2")))) + (build-system haskell-build-system) + (properties '((upstream-name . "modern-uri"))) + (inputs (list ghc-quickcheck + ghc-hashable + ghc-megaparsec + ghc-profunctors + ghc-reflection + ghc-tagged)) + (native-inputs (list ghc-hspec + ghc-hspec-megaparsec + ghc-hspec-discover)) + (arguments + `(#:cabal-revision ("1" + "0c0mr8aqs963nmy7i8yfih24snaijgwkxim2q2khw12capshac0q"))) + (home-page "https://github.com/mrkkrp/modern-uri") + (synopsis "Library for working with URIs") + (description "This is a library for working with URIs in Haskell as +per RFC 3986.") + (license license:bsd-3))) + (define-public ghc-html (package (name "ghc-html") diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index fa423ae2ca..290ea50ed6 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -450,6 +450,26 @@ colored output using the ansi-terminal package.") style.") (license license:bsd-3))) +(define-public ghc-aspell-pipe + (package + (name "ghc-aspell-pipe") + (version "0.6") + (source + (origin + (method url-fetch) + (uri (hackage-uri "aspell-pipe" version)) + (sha256 + (base32 "09dw4v4j5pmqi8pdh3p7kk7f8pph5w33s7vd21fgvhv3arnrj6p8")))) + (build-system haskell-build-system) + (properties '((upstream-name . "aspell-pipe"))) + (inputs (list ghc-async)) + (home-page "https://hackage.haskell.org/package/aspell-pipe") + (synopsis "Pipe-based interface to the Aspell program") + (description + "This package provides a pipe-based interface to the Aspell program (no +dynamic linking required).") + (license license:bsd-3))) + (define-public ghc-assoc (package (name "ghc-assoc") @@ -952,6 +972,27 @@ storing and transmitting loosely structured data.") (description "This package provides bifunctors for Haskell.") (license license:bsd-3))) +(define-public ghc-bimap + (package + (name "ghc-bimap") + (version "0.5.0") + (source + (origin + (method url-fetch) + (uri (hackage-uri "bimap" version)) + (sha256 + (base32 "158cdwk9jwklcfgbn62dqq255i40w13ifggsdps87sxc5q7lpd5h")))) + (build-system haskell-build-system) + (properties '((upstream-name . "bimap"))) + (native-inputs (list ghc-quickcheck)) + (home-page "https://github.com/joelwilliamson/bimap") + (synopsis "Bidirectional mapping between two key types") + (description + "This package provides a data structure representing a bidirectional +mapping between two key types. Each value in the bimap is associated with +exactly one value of the opposite type.") + (license license:bsd-3))) + (define-public ghc-bindings-dsl (package (name "ghc-bindings-dsl") @@ -1789,6 +1830,31 @@ linear performance. Output is sanitized by default for protection against cross-site scripting (@dfn{XSS}) attacks.") (license license:bsd-3))) +(define-public ghc-checkers + (package + (name "ghc-checkers") + (version "0.6.0") + (source + (origin + (method url-fetch) + (uri (hackage-uri "checkers" version)) + (sha256 + (base32 "1r4rsa4k0fy8xig3m530ryflry9viv9v47g4gh7h0ld27rbd6z60")))) + (build-system haskell-build-system) + (properties '((upstream-name . "checkers"))) + (inputs (list ghc-random ghc-quickcheck ghc-semigroupoids)) + (arguments + `(#:cabal-revision ("1" + "0wkvf57zd7i87z18vj285whjpcl9pscpwxz2cp7v7w6kk0769p0i"))) + (home-page "https://github.com/haskell-checkers/checkers") + (synopsis "Check properties on standard classes and data structures") + (description + "Checkers wraps up the expected properties associated with various +standard type classes as @code{QuickCheck} properties. It also provides some +morphism properties, arbitrary instances, and generator combinators for common +data types.") + (license license:bsd-3))) + (define-public ghc-chell (package (name "ghc-chell") @@ -7497,6 +7563,28 @@ that are much lighter weight than IO-threads.") and other added capabilities layered on top of the @code{Par} monad.") (license license:bsd-3))) +(define-public ghc-monad-parallel + (package + (name "ghc-monad-parallel") + (version "0.8") + (source + (origin + (method url-fetch) + (uri (hackage-uri "monad-parallel" version)) + (sha256 + (base32 "1j905cwc440g7rvbhsdkqf50ag7p2bi6cy2rqsk918rn80fqqra4")))) + (build-system haskell-build-system) + (properties '((upstream-name . "monad-parallel"))) + (inputs (list ghc-parallel ghc-transformers-compat)) + (home-page "https://hub.darcs.net/blamario/SCC.wiki/") + (synopsis "Parallel execution of monadic computations") + (description + "This package defines classes of monads that can perform multiple +executions in parallel and combine their results. For any monad that's an +instance of the class, the package re-implements a subset of the +@code{Control.Monad} interface, but with parallel execution.") + (license license:bsd-3))) + (define-public ghc-monadrandom (package (name "ghc-monadrandom") @@ -8431,13 +8519,13 @@ plus the length of the UTF-8 encoded payload.") (define-public ghc-text-zipper (package (name "ghc-text-zipper") - (version "0.12") + (version "0.13") (source (origin (method url-fetch) (uri (hackage-uri "text-zipper" version)) (sha256 (base32 - "00k7d6qfznhp6l2ihw3pppkn580pwd7ac7wx9vidil4y9hjagaw6")))) + "1acq583wmgb53viqslbkgl454300fawg5lryxddfiy1mqk3iqlh6")))) (build-system haskell-build-system) (properties '((upstream-name . "text-zipper"))) (inputs (list ghc-vector)) @@ -11669,6 +11757,28 @@ features.") source and a sink.") (license license:bsd-3))) +(define-public ghc-stm-delay + (package + (name "ghc-stm-delay") + (version "0.1.1.1") + (source + (origin + (method url-fetch) + (uri (hackage-uri "stm-delay" version)) + (sha256 + (base32 "0cla21v89gcvmr1iwzibq13v1yq02xg4h6k9l6kcprj7mhd5hcmi")))) + (build-system haskell-build-system) + (properties '((upstream-name . "stm-delay"))) + (home-page "https://github.com/joeyadams/haskell-stm-delay") + (synopsis "Updatable one-shot timer polled with STM") + (description + "This library lets you create a one-shot timer, poll it using STM, and +update it to ring at a different time than initially specified. It uses GHC +event manager timeouts when available, yielding performance similar to +@code{threadDelay} and @code{registerDelay}. Otherwise, it falls back to +forked threads and @code{threadDelay}.") + (license license:bsd-3))) + (define-public ghc-stmonadtrans (package (name "ghc-stmonadtrans") @@ -13277,6 +13387,31 @@ operations. Uniplate has similar goals to the original Scrap Your Boilerplate work, but is substantially simpler and faster.") (license license:bsd-3))) +(define-public ghc-unique + (package + (name "ghc-unique") + (version "0.4.7.9") + (source + (origin + (method url-fetch) + (uri (hackage-uri "Unique" version)) + (sha256 + (base32 "14f1qnmhdmbam8qis725dhwq1mk9h86fsnzhkwhsx73ny9z29s1l")) + (patches (search-patches "ghc-unique-support-newer-hashable.patch")))) + (build-system haskell-build-system) + (properties '((upstream-name . "Unique"))) + (inputs (list ghc-extra ghc-hashable ghc-unordered-containers)) + (native-inputs (list ghc-hspec ghc-quickcheck)) + (arguments + `(#:cabal-revision ("1" + "10s0npnfkh7naj49afmyrvnilikp6426fbhi49f97pxrgcmy4dvw"))) + (home-page "https://hackage.haskell.org/package/Unique") + (synopsis "Haskell functionality like \"uniq\" tool") + (description + "This library provides the functions to find unique and duplicate +elements in a list.") + (license license:bsd-3))) + (define-public ghc-unix-compat (package (name "ghc-unix-compat") @@ -13295,9 +13430,31 @@ work, but is substantially simpler and faster.") (home-page "https://github.com/jacobstanley/unix-compat") (synopsis "Portable POSIX-compatibility layer") (description - "This package provides portable implementations of parts of the unix -package. This package re-exports the unix package when available. When it -isn't available, portable implementations are used.") + "This package provides portable implementations of parts of the +@code{unix} package. This package re-exports the @code{unix} package when +available. When it isn't available, portable implementations are used.") + (license license:bsd-3))) + +(define-public ghc-unix-compat-7 + (package + (name "ghc-unix-compat") + (version "0.7.1") + (source + (origin + (method url-fetch) + (uri (hackage-uri "unix-compat" version)) + (sha256 + (base32 "0gz30f4g3gyjz60jbcg072ms67pwdn4by6wvdkg63hjshgl0cj60")))) + (build-system haskell-build-system) + (properties '((upstream-name . "unix-compat"))) + (native-inputs (list ghc-monad-parallel ghc-hspec ghc-hunit ghc-extra + ghc-temporary)) + (home-page "https://github.com/haskell-pkg-janitors/unix-compat") + (synopsis "Portable POSIX-compatibility layer") + (description + "This package provides portable implementations of parts of the unix package. +This package re-exports the unix package when available. When it isn't +available, portable implementations are used.") (license license:bsd-3))) (define-public ghc-unix-time @@ -13975,6 +14132,67 @@ given term should not exist.") to use and to provide good support for common terminal types.") (license license:bsd-3))) +(define-public ghc-vty-6 + (package + (inherit ghc-vty) + (name "ghc-vty") + (version "6.2") + (source + (origin + (method url-fetch) + (uri (hackage-uri "vty" version)) + (sha256 + (base32 "0ywqfdngfv5pnsk5pa99yizpbhdq856sy3z70q2hmpmlc2r4h7vg")))) + (properties '((upstream-name . "vty"))) + (inputs (list ghc-blaze-builder ghc-microlens ghc-microlens-mtl + ghc-utf8-string ghc-vector)))) + +(define-public ghc-vty-crossplatform + (package + (name "ghc-vty-crossplatform") + (version "0.4.0.0") + (source + (origin + (method url-fetch) + (uri (hackage-uri "vty-crossplatform" version)) + (sha256 + (base32 "06iwxgqrqzz05hmic7z5hxd48x0i49sk935vm0xfi0xq28sl7r9m")))) + (build-system haskell-build-system) + (properties '((upstream-name . "vty-crossplatform"))) + (inputs (list ghc-vty-6 ghc-vty-unix ghc-random ghc-string-qq)) + (home-page "https://hackage.haskell.org/package/vty-crossplatform") + (synopsis "Cross-platform support for Vty") + (description + "This package provides a generic interface for multiple Vty platforms in +one package so you don't have to conditionally depend on them in your cabal +file.") + (license license:bsd-3))) + +(define-public ghc-vty-unix + (package + (name "ghc-vty-unix") + (version "0.2.0.0") + (source + (origin + (method url-fetch) + (uri (hackage-uri "vty-unix" version)) + (sha256 + (base32 "1hfxc7qw884vlq8qshhyndl3zs10jc2xr6i69vhasjywkvh6gay2")))) + (build-system haskell-build-system) + (properties '((upstream-name . "vty-unix"))) + (inputs (list ghc-blaze-builder + ghc-vty-6 + ghc-vector + ghc-utf8-string + ghc-microlens + ghc-microlens-mtl + ghc-microlens-th + ghc-ansi-terminal)) + (home-page "https://hackage.haskell.org/package/vty-unix") + (synopsis "Unix backend for Vty") + (description "This package provides Unix terminal support for Vty.") + (license license:bsd-3))) + (define-public ghc-wave (package (name "ghc-wave") @@ -14922,6 +15140,28 @@ footnotes, math, and more.") Pandoc types.") (license license:bsd-3))) +(define-public ghc-hclip + (package + (name "ghc-hclip") + (version "3.0.0.4") + (source + (origin + (method url-fetch) + (uri (hackage-uri "Hclip" version)) + (sha256 + (base32 "04ppwm7vfzndrys8x1n8vfb41vzwx59r9xp4dkbiqmrms390pj6q")))) + (build-system haskell-build-system) + (properties '((upstream-name . "Hclip"))) + (inputs (list ghc-strict)) + (home-page "https://github.com/jetho/Hclip") + (synopsis + "Small cross-platform library for reading and modifying the system clipboard") + (description + "This package provides a small cross-platform library for reading and +modifying the system clipboard. It uses @code{xclip} or @code{xsel} +at runtime.") + (license license:bsd-3))) + (define-public ghc-hslua-module-path (package (name "ghc-hslua-module-path") @@ -15632,6 +15872,59 @@ purposes. See the [README](https://github.com/aaronallen8455/breakpoint#breakpoint) for details.") (license license:expat))) +(define-public ghc-brick + (package + (name "ghc-brick") + (version "2.3.1") + (source + (origin + (method url-fetch) + (uri (hackage-uri "brick" version)) + (sha256 + (base32 "160np0bz1mcfkp077yc936i026s3zv1czn8lj3k3qr6scldavw35")))) + (build-system haskell-build-system) + (properties '((upstream-name . "brick"))) + (inputs (list ghc-vty-6 + ghc-vty-crossplatform + ghc-bimap + ghc-data-clist + ghc-microlens + ghc-microlens-th + ghc-microlens-mtl + ghc-config-ini + ghc-vector + ghc-text-zipper + ghc-unix-compat-7 + ghc-word-wrap + ghc-random)) + (native-inputs (list ghc-quickcheck)) + (home-page "https://github.com/jtdaugherty/brick/") + (synopsis "Declarative terminal user interface library") + (description + "Brick helps you write @dfn{terminal user interfaces} (TUIs). You write +an event handler and a drawing function and the library does the rest.") + (license license:bsd-3))) + +(define-public ghc-brick-skylighting + (package + (name "ghc-brick-skylighting") + (version "1.0") + (source + (origin + (method url-fetch) + (uri (hackage-uri "brick-skylighting" version)) + (sha256 + (base32 "1nw2x9zn0jlvykm89v80fh4187bxgn8l4cljgnf4mp4ci7aqjmkr")))) + (build-system haskell-build-system) + (properties '((upstream-name . "brick-skylighting"))) + (inputs (list ghc-brick ghc-vty-6 ghc-skylighting-core)) + (home-page "https://github.com/jtdaugherty/brick-skylighting/") + (synopsis "Show syntax-highlighted text in your Brick UI") + (description + "This package provides a module to use Skylighting to perform syntax +highlighting and display the results in Brick-based interfaces.") + (license license:bsd-3))) + (define-public ghc-githash (package (name "ghc-githash") diff --git a/gnu/packages/high-availability.scm b/gnu/packages/high-availability.scm index c629385310..89d3e22c7e 100644 --- a/gnu/packages/high-availability.scm +++ b/gnu/packages/high-availability.scm @@ -226,7 +226,6 @@ applications.") go-golang-org-x-time)) (arguments (list - #:go go-1.20 #:import-path "github.com/nats-io/nats-server" #:install-source? #f)) (home-page "https://github.com/nats-io/nats-server") diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index b7d901b88f..65bf701f09 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -820,7 +820,7 @@ due to its architecture which automatically parallelises the image workflows.") (uri (string-append "https://gmic.eu/files/source/gmic_" version ".tar.gz")) (sha256 - (base32 "1c2j1prsnsks5cglk0vrwaclifk6mlxmrc88wqc96xi7cmwwjmf3")))) + (base32 "0akrrpkwkc8d7f2r3nqr36cjd926zk221yppi1bmv4yvydx0hvyz")))) (build-system cmake-build-system) (arguments `(#:tests? #f ;there are no tests diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 5f73a6c3f6..a709822e5b 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -35,7 +35,7 @@ ;;; Copyright © 2022 Jai Vetrivelan <jaivetrivelan@gmail.com> ;;; Copyright © 2022 ( <paren@disroot.org> ;;; Copyright © 2022-2023 Bruno Victal <mirai@makinata.eu> -;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2023, 2024 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2023-2024 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2023 Artyom V. Poptsov <poptsov.artyom@gmail.com> ;;; Copyright © 2024 chris <chris@bumblehead.com> @@ -1268,7 +1268,8 @@ supplies a generic doubly-linked list and some string functions.") (search-patches "freeimage-unbundle.patch" "freeimage-libtiff-compat.patch" "freeimage-CVE-2020-21428.patch" - "freeimage-CVE-2020-22524.patch") + "freeimage-CVE-2020-22524.patch" + "freeimage-libraw-0.21-compat.patch") ;; Take one patch from Arch Linux that adds LibRaw 0.20 compatibility. (list (origin (method url-fetch) @@ -2457,7 +2458,7 @@ This package can be used to create @code{favicon.ico} files for web sites.") (define-public libavif (package (name "libavif") - (version "0.11.1") + (version "1.0.4") (source (origin (method git-fetch) (uri (git-reference @@ -2466,7 +2467,7 @@ This package can be used to create @code{favicon.ico} files for web sites.") (file-name (git-file-name name version)) (sha256 (base32 - "02zmb62g0yx6rfz4w1isyzfrckv5i7dzyz26rp2mspbx9w6v8j4r")))) + "0k72q7yvfdn92wkslyifw14319nm981a8r3kd84i4ylxmrkgi0zm")))) (build-system cmake-build-system) (arguments (list diff --git a/gnu/packages/installers.scm b/gnu/packages/installers.scm index 9879359be7..d1145a5d58 100644 --- a/gnu/packages/installers.scm +++ b/gnu/packages/installers.scm @@ -34,14 +34,14 @@ (xgcc (cross-gcc triplet #:libc xlibc))) (package (name (string-append "nsis-" machine)) - (version "3.09") + (version "3.10") (source (origin (method url-fetch) (uri (string-append "http://prdownloads.sourceforge.net/nsis/nsis-" version "-src.tar.bz2")) (sha256 (base32 - "1qjnvhnj89a40ac10k2mbln0yqscdmawmgw71816i465x734dn0c")) + "15xj1izz3cmaw0mazsvfm8jpr132dyphlw5j0pszwimb0xilmd8i")) (patches (search-patches "nsis-env-passthru.patch")))) (build-system scons-build-system) (native-inputs `(("xgcc" ,xgcc) diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm index d75a99c4e1..55c10724c4 100644 --- a/gnu/packages/ipfs.scm +++ b/gnu/packages/ipfs.scm @@ -29,6 +29,7 @@ #:use-module (guix git-download) #:use-module (guix download) #:use-module (guix build-system go) + #:use-module (gnu packages gcc) #:use-module (gnu packages golang) #:use-module (gnu packages golang-build) #:use-module (gnu packages golang-check) @@ -40,6 +41,31 @@ #:use-module (gnu packages shells) #:use-module (gnu packages specifications)) +(define-public go-github-com-ipfs-bbloom + (package + (name "go-github-com-ipfs-bbloom") + (version "0.0.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ipfs/bbloom") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0dcdn7nlysynl7yrbivv8m7j83jq7pabhcff8mvfjdk583rgnkp2")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/ipfs/bbloom")) + (home-page "https://github.com/ipfs/bbloom") + (synopsis "Fast bit set Bloom filter") + (description + "This package implements a fast bloom filter with real @code{bitset} and +JSONMarshal/JSONUnmarshal to store/reload the Bloom filter.") + (license (list license:expat ; bbloom.go + license:public-domain)))) ; siphash.go + (define-public go-github-com-ipfs-go-block-format (package (name "go-github-com-ipfs-go-block-format") @@ -56,7 +82,6 @@ (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/ipfs/go-block-format")) (propagated-inputs (list go-github-com-multiformats-go-multihash @@ -72,6 +97,73 @@ by a @acronym{Content Identifiers,CID}. The CID contains the multihash corresponding to the block.") (license license:expat))) +(define-public go-github-com-ipfs-go-ipfs-blockstore + (package + (name "go-github-com-ipfs-go-ipfs-blockstore") + (version "1.3.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ipfs/go-ipfs-blockstore") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1a3a0fm8k8njdlq2w795qff01piadjfp6r5r2hww69fxqsplln9l")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/ipfs/go-ipfs-blockstore")) + (propagated-inputs + (list go-github-com-hashicorp-golang-lru + go-github-com-ipfs-bbloom + go-github-com-ipfs-go-block-format + go-github-com-ipfs-go-cid + go-github-com-ipfs-go-datastore + go-github-com-ipfs-go-ipfs-ds-help + go-github-com-ipfs-go-ipfs-util + go-github-com-ipfs-go-ipld-format + go-github-com-ipfs-go-log + go-github-com-ipfs-go-metrics-interface + go-github-com-multiformats-go-multihash + go-go-uber-org-atomic)) + (home-page "https://github.com/ipfs/go-ipfs-blockstore") + (synopsis "Caching wrapper over a IPFS datastore") + (description + "@code{go-ipfs-blockstore} implements a thin wrapper over an IPFS datastore, +giving a clean interface for getting and putting block objects.") + (license license:expat))) + +(define-public go-github-com-ipfs-go-ipfs-blocksutil + ;; Use the latest commit from the "master" branch to fix the build with + ;; go-1.21, see <https://github.com/ipfs/go-ipfs-blocksutil/issues/25>. + (let ((commit "ce0497f5ee55c479db98905aec8ff56c27aad2a2") + (revision "0")) + (package + (name "go-github-com-ipfs-go-ipfs-blocksutil") + (version (git-version "0.0.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ipfs/go-ipfs-blocksutil") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1ya6376wphp51rv48nmv4jw3x0mf6ym5yx1650fbkp5l5crqpdb8")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/ipfs/go-ipfs-blocksutil")) + (propagated-inputs + (list go-github-com-ipfs-go-block-format)) + (home-page "https://github.com/ipfs/go-ipfs-blocksutil") + (synopsis "Utility functions for working with IPFS blocks") + (description + "This package provides an utility functions for working with +@url{https://github.com/ipfs/go-block-format, IPFS blocks}.") + (license license:expat)))) + (define-public go-github-com-ipfs-go-cid (package (name "go-github-com-ipfs-go-cid") @@ -88,7 +180,6 @@ corresponding to the block.") (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/ipfs/go-cid")) (propagated-inputs (list go-github-com-multiformats-go-multihash @@ -117,7 +208,6 @@ used in @code{go-ipfs} and related packages to refer to a typed hunk of data.") (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/ipfs/go-cidutil")) (propagated-inputs (list go-github-com-ipfs-go-cid @@ -150,7 +240,9 @@ with @url{https://github.com/ipld/cid, CIDs}.") "0qk6fshgdmhp8dip2ksm13j6nywi41m9mn0czkvmw6b697z85l2r")))) (build-system go-build-system) (arguments - `(#:go ,go-1.16 + `(#:go ,@(if (supported-package? go-1.16) + `(,go-1.16) + `(,gccgo-11)) #:unpack-path "github.com/ipfs/go-ipfs-cmdkit" #:import-path "github.com/ipfs/go-ipfs-cmdkit/files")) (home-page "https://github.com/ipfs/go-ipfs-cmdkit") @@ -184,6 +276,35 @@ that are shared between @command{go-ipfs/commands} and its rewrite objects.") (license license:expat))) +(define-public go-github-com-ipfs-go-ipfs-ds-help + (package + (name "go-github-com-ipfs-go-ipfs-ds-help") + (version "1.1.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ipfs/go-ipfs-ds-help") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1xmn9pdyrcim9ahqs9pkh0c9ac71gilb3pb48kcagq8zxf22i4bj")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/ipfs/go-ipfs-ds-help")) + (propagated-inputs + (list go-github-com-ipfs-go-cid + go-github-com-ipfs-go-datastore + go-github-com-multiformats-go-base32 + go-github-com-multiformats-go-multihash)) + (home-page "https://github.com/ipfs/go-ipfs-ds-help") + (synopsis "Utilities for parsing and creating datastore keys") + (description + "@code{go-ipfs-ds-help} provides utilities for parsing and creating datastore +keys used by @code{go-ipfs} (Kubo).") + (license license:expat))) + (define-public go-github-com-ipfs-go-datastore (package (name "go-github-com-ipfs-go-datastore") @@ -237,13 +358,38 @@ throughout its lifetime.") (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/ipfs/go-detect-race")) (home-page "https://github.com/ipfs/go-detect-race") (synopsis "Detect if compiled with race") (description "Check if the race detector is running.") (license license:expat))) +(define-public go-github-com-ipfs-go-ipfs-exchange-interface + (package + (name "go-github-com-ipfs-go-ipfs-exchange-interface") + (version "0.2.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ipfs/go-ipfs-exchange-interface") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0h5jizhjq4yz9sikqc6yhv5gsb8fgv67v0qjzagyhfznfx8kwv1d")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/ipfs/go-ipfs-exchange-interface")) + (propagated-inputs + (list go-github-com-ipfs-go-block-format + go-github-com-ipfs-go-cid)) + (home-page "https://github.com/ipfs/go-ipfs-exchange-interface") + (synopsis "The IPFS Exchange interface") + (description + "@code{go-ipfs-exchange-interface} defines the IPFS exchange interface.") + (license license:expat))) + (define-public go-github-com-ipfs-go-ipfs-util (package (name "go-github-com-ipfs-go-ipfs-util") @@ -262,7 +408,6 @@ throughout its lifetime.") go-github-com-multiformats-go-multihash)) (arguments (list - #:go go-1.21 #:import-path "github.com/ipfs/go-ipfs-util")) (home-page "https://github.com/ipfs/go-ipfs-util") (synopsis "Common utilities used by @code{go-ipfs} and related packages") @@ -270,6 +415,79 @@ throughout its lifetime.") "Common utilities used by @code{go-ipfs} and other related Go packages.") (license license:expat))) +(define-public go-github-com-ipfs-go-ipld-cbor + (package + (name "go-github-com-ipfs-go-ipld-cbor") + (version "0.1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ipfs/go-ipld-cbor") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0yxk4sbf1fk9aaizzpz3h30049wqvaz0s3jnbdd5akhj7wg89h21")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/ipfs/go-ipld-cbor")) + (propagated-inputs + (list go-github-com-ipfs-go-block-format + go-github-com-ipfs-go-cid + go-github-com-ipfs-go-ipfs-util + go-github-com-ipfs-go-ipld-format + go-github-com-multiformats-go-multihash + go-github-com-polydawn-refmt + go-github-com-whyrusleeping-cbor-gen)) + (home-page "https://github.com/ipfs/go-ipld-cbor") + (synopsis "A cbor implementation of the @code{go-ipld-format}") + (description + "An implementation of a @url{https://cbor.io/, CBOR} encoded merkledag object.") + (license license:expat))) + +(define-public go-github-com-ipfs-go-ipld-git + (package + (name "go-github-com-ipfs-go-ipld-git") + (version "0.1.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ipfs/go-ipld-git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1v52qzgmx7qym0qzkzkry2kfj58f9hh7c8qycg74sqbd9zb1ynjj")))) + (build-system go-build-system) + (arguments + (list + ;; XXX: It requires .git/objects, check if it's applicable to generate + ;; git repo during check phase with make-test-repo.sh. + #:tests? #f + #:import-path "github.com/ipfs/go-ipld-git" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'remove-test-data-files + (lambda* (#:key import-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" import-path) + (for-each delete-file + (list "testdata.tar.gz" + "codecov.yml" + "make-test-repo.sh")))))))) + (propagated-inputs + (list go-github-com-multiformats-go-multihash + go-github-com-ipld-go-ipld-prime + go-github-com-ipfs-go-cid + go-github-com-ipfs-go-block-format)) + (home-page "https://github.com/ipfs/go-ipld-git") + (synopsis "IPLD handlers for git objects") + (description + "This is an IPLD codec which handles git objects. Objects are transformed into +IPLD graph as detailed below. Objects are demonstrated here using both +@url{https://ipld.io/docs/schemas/,IPLD Schemas} and example JSON forms.") + (license license:expat))) + (define-public go-github-com-ipfs-go-ipld-format (package (name "go-github-com-ipfs-go-ipld-format") @@ -286,7 +504,6 @@ throughout its lifetime.") (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/ipfs/go-ipld-format")) (propagated-inputs (list go-github-com-multiformats-go-multihash @@ -299,6 +516,64 @@ throughout its lifetime.") order to be a part of the @acronym{IPLD, InterPlanetary Linked Data} merkle-forest.") (license license:expat))) +(define-public go-github-com-ipfs-go-ipld-legacy + (package + (name "go-github-com-ipfs-go-ipld-legacy") + (version "0.2.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ipfs/go-ipld-legacy") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0sc2zc3lyxy30fzynwdpfrl8jhh1ynwixn1crrv8hzn93yix6550")))) + (build-system go-build-system) + (arguments + (list + #:go go-1.21 + #:import-path "github.com/ipfs/go-ipld-legacy")) + (native-inputs (list go-github-com-stretchr-testify)) + (propagated-inputs (list go-github-com-ipfs-go-block-format + go-github-com-ipfs-go-cid + go-github-com-ipfs-go-ipld-format + go-github-com-ipld-go-ipld-prime)) + (home-page "https://github.com/ipfs/go-ipld-legacy") + (synopsis "Translation layer for IPLD legacy code") + (description + "@code{go-ipld-format} is a translation layer between @code{go-ipld-prime} nodes +and @code{go-ipld-format} legacy interface.") + (license (list license:expat license:asl2.0)))) + +(define-public go-github-com-ipld-go-codec-dagpb + (package + (name "go-github-com-ipld-go-codec-dagpb") + (version "1.6.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ipld/go-codec-dagpb") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1jbrwbgr222wsi95gdflbj350csja6k8vphdq7c9bm50ipr8bvkq")))) + (build-system go-build-system) + (arguments + (list + #:go go-1.21 + #:import-path "github.com/ipld/go-codec-dagpb")) + (propagated-inputs (list go-github-com-ipfs-go-cid + go-github-com-ipld-go-ipld-prime + go-google-golang-org-protobuf)) + (home-page "https://github.com/ipld/go-codec-dagpb/") + (synopsis "Implementation of the DAG-PB spec for Go") + (description + "An implementation of the @url{https://ipld.io/, IPLD DAG-PB} spec for +@code{go-ipld-prime}.") + (license (list license:expat license:asl2.0)))) + (define-public go-github-com-ipld-go-ipld-prime (package (name "go-github-com-ipld-go-ipld-prime") @@ -315,7 +590,6 @@ order to be a part of the @acronym{IPLD, InterPlanetary Linked Data} merkle-fore (build-system go-build-system) (arguments (list - #:go go-1.21 #:unpack-path "github.com/ipld/go-ipld-prime/" #:import-path "github.com/ipld/go-ipld-prime/" #:phases @@ -415,7 +689,6 @@ basic operations on IPLD objects (traversals, etc).") go-go-uber-org-zap)) (arguments (list - #:go go-1.21 #:import-path "github.com/ipfs/go-log/v2")) (home-page "https://github.com/ipfs/go-log") (synopsis "Logging library used by @code{go-ipfs}") @@ -446,9 +719,98 @@ their levels to be controlled individually.") go-go-uber-org-zap)) (arguments (list - #:go go-1.21 #:import-path "github.com/ipfs/go-log")))) +(define-public go-github-com-ipfs-go-metrics-interface + (package + (name "go-github-com-ipfs-go-metrics-interface") + (version "0.0.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ipfs/go-metrics-interface") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "09xc71175sfnqlizkbw066jagnbag9ihvs240z6g6dm2yx3w5xgy")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/ipfs/go-metrics-interface")) + (propagated-inputs + (list go-github-com-ipfs-go-cid + go-github-com-ipfs-go-datastore + go-github-com-multiformats-go-base32 + go-github-com-multiformats-go-multihash)) + (home-page "https://github.com/ipfs/go-metrics-interface") + ;; XXX: The project neither has no a proper description, nor a README, see + ;; <https://github.com/ipfs/go-metrics-interface/issues/1>. + (synopsis "Metrics interface for IPFS") + (description + "Metrics interface for IPFS (Kubo).") + (license license:expat))) + +(define-public go-github-com-libp2p-go-socket-activation + (package + (name "go-github-com-libp2p-go-socket-activation") + (version "0.1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/libp2p/go-socket-activation") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1cqxzmjfg7838xifs07kigys9icardwlj1wl426mzgzmbwn6pg5s")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/libp2p/go-socket-activation")) + (propagated-inputs + (list go-github-com-coreos-go-systemd-v22 + go-github-com-ipfs-go-log + go-github-com-multiformats-go-multiaddr-0.12)) + (home-page "https://github.com/libp2p/go-socket-activation") + (synopsis "Multiaddr backed systemd socket activation") + (description + "This package provides access to sockets registered by the system's init +daemon as described in +@url{http://0pointer.de/blog/projects/socket-activation}.") + (license license:expat))) + +(define-public go-github-com-whyrusleeping-cbor-gen + (package + (name "go-github-com-whyrusleeping-cbor-gen") + (version "v0.0.0-20230818171029-f91ae536ca25") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/whyrusleeping/cbor-gen") + (commit (go-version->git-ref version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "08by7pqh4fcwf2va01iif75yqkfssi6d48334404mmv9jmhzim60")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/whyrusleeping/cbor-gen")) + (propagated-inputs + (list go-github-com-ipfs-go-cid + go-github-com-google-go-cmp-cmp + go-golang-org-x-xerrors)) + (home-page "https://github.com/whyrusleeping/cbor-gen") + (synopsis "Codegen for CBOR codecs on the specified types") + (description + "Basic utilities to generate fast path @url{https://cbor.io/, CBOR} codecs for +types.") + (license license:expat))) + +;; XXX: No updates for 4 years, and depends on dated Golang modules which +;; require go-1.16 to compile, see +;; <https://github.com/whyrusleeping/gx/issues/247>. (define-public gx (package (name "gx") @@ -507,6 +869,9 @@ powerful and simple.") '(#:unpack-path "github.com/whyrusleeping/gx" #:import-path "github.com/whyrusleeping/gx/gxutil")))) +;; XXX: No updates for 4 years, and depends on dated Golang modules which +;; require go-1.16 to compile, see +;; <https://github.com/whyrusleeping/gx-go/issues/65>. (define-public gx-go (package (name "gx-go") @@ -586,6 +951,7 @@ written in Go.") "vendor/github.com/docker" "vendor/github.com/dustin" "vendor/github.com/elgris" + "vendor/github.com/facebookgo" "vendor/github.com/felixge" "vendor/github.com/flynn" "vendor/github.com/francoispqt" @@ -609,13 +975,19 @@ written in Go.") "vendor/github.com/ipfs/go-detect-race" "vendor/github.com/ipfs/go-ipfs-delay" "vendor/github.com/ipfs/go-ipfs-util" + "vendor/github.com/ipfs/go-ipld-cbor" "vendor/github.com/ipfs/go-ipld-format" + "vendor/github.com/ipfs/go-ipld-git" + "vendor/github.com/ipfs/go-ipld-legacy" "vendor/github.com/ipfs/go-log" + "vendor/github.com/ipfs/go-metrics-interface" + "vendor/github.com/ipld/go-codec-dagpb" "vendor/github.com/ipld/go-ipld-prime" "vendor/github.com/jackpal" "vendor/github.com/jbenet" "vendor/github.com/julienschmidt" "vendor/github.com/klauspost" + "vendor/github.com/libp2p/go-socket-activation" "vendor/github.com/mattn" "vendor/github.com/mgutz" "vendor/github.com/miekg" @@ -638,7 +1010,7 @@ written in Go.") "vendor/github.com/stretchr" "vendor/github.com/syndtr" "vendor/github.com/tidwall" - "vendor/github.com/whyrusleeping/go-sysinfo" + "vendor/github.com/whyrusleeping" "vendor/go.uber.org" "vendor/golang.org" "vendor/gopkg.in" @@ -648,7 +1020,6 @@ written in Go.") (list #:unpack-path "github.com/ipfs/kubo" #:import-path "github.com/ipfs/kubo/cmd/ipfs" - #:go go-1.21 #:phases #~(modify-phases %standard-phases ;; https://github.com/ipfs/kubo/blob/master/docs/command-completion.md @@ -679,7 +1050,7 @@ written in Go.") go-github-com-coreos-go-systemd-v22 go-github-com-dustin-go-humanize go-github-com-elgris-jsondiff - ;;go-github-com-facebookgo-atomicfile + go-github-com-facebookgo-atomicfile go-github-com-fsnotify-fsnotify go-github-com-google-uuid go-github-com-hashicorp-go-multierror @@ -688,26 +1059,27 @@ written in Go.") go-github-com-ipfs-go-cid go-github-com-ipfs-go-cidutil go-github-com-ipfs-go-datastore + go-github-com-ipfs-go-detect-race ;;go-github-com-ipfs-go-ds-badger ;;go-github-com-ipfs-go-ds-flatfs ;;go-github-com-ipfs-go-ds-leveldb ;;go-github-com-ipfs-go-ds-measure ;;go-github-com-ipfs-go-fs-lock ;;go-github-com-ipfs-go-ipfs-cmds - ;;go-github-com-ipfs-go-ipld-cbor + go-github-com-ipfs-go-ipld-cbor go-github-com-ipfs-go-ipld-format - ;;go-github-com-ipfs-go-ipld-git - ;;go-github-com-ipfs-go-ipld-legacy + go-github-com-ipfs-go-ipld-git + go-github-com-ipfs-go-ipld-legacy go-github-com-ipfs-go-log go-github-com-ipfs-go-log-v2 - ;;go-github-com-ipfs-go-metrics-interface + go-github-com-ipfs-go-metrics-interface ;;go-github-com-ipfs-go-metrics-prometheus ;;go-github-com-ipfs-go-unixfsnode ;;go-github-com-ipfs-shipyard-nopfs ;;go-github-com-ipfs-shipyard-nopfs-ipfs ;;go-github-com-ipld-go-car ;;go-github-com-ipld-go-car-v2 - ;;go-github-com-ipld-go-codec-dagpb + go-github-com-ipld-go-codec-dagpb go-github-com-ipld-go-ipld-prime go-github-com-jbenet-go-random go-github-com-jbenet-go-temp-err-catcher @@ -723,8 +1095,7 @@ written in Go.") ;;go-github-com-libp2p-go-libp2p-record ;;go-github-com-libp2p-go-libp2p-routing-helpers ;;go-github-com-libp2p-go-libp2p-testing - ;;go-github-com-libp2p-go-socket-activation - go-github-com-ipfs-go-ipfs-util + go-github-com-libp2p-go-socket-activation go-github-com-mitchellh-go-homedir go-github-com-multiformats-go-multiaddr-0.12 go-github-com-multiformats-go-multiaddr-dns @@ -733,13 +1104,13 @@ written in Go.") go-github-com-multiformats-go-multihash go-github-com-opentracing-opentracing-go go-github-com-pbnjay-memory - go-github-com-pkg-errors go-github-com-prometheus-client-golang go-github-com-stretchr-testify - go-github-com-syndtr-goleveldb-leveldb + go-github-com-syndtr-goleveldb + go-github-com-tidwall-gjson go-github-com-tidwall-sjson go-github-com-whyrusleeping-go-sysinfo - ;;go-github-com-whyrusleeping-multiaddr-filter + go-github-com-whyrusleeping-multiaddr-filter ;;go-go-opencensus-io ;;go-go-opentelemetry-io-contrib-instrumentation-net-http-otelhttp ;;go-go-opentelemetry-io-contrib-propagators-autoprop @@ -751,12 +1122,11 @@ written in Go.") go-go-uber-org-multierr go-go-uber-org-zap go-golang-org-x-crypto - go-golang-org-x-exp-2023 + go-golang-org-x-exp go-golang-org-x-mod go-golang-org-x-sync go-golang-org-x-sys go-google-golang-org-protobuf - go-gopkg-in-yaml-v3 ;; ;; A list of indirect dependencies required for the vendored @@ -781,6 +1151,10 @@ written in Go.") go-github-com-multiformats-go-multiaddr-fmt ; github.com/libp2p/go-libp2p go-github-com-multiformats-go-multistream ; github.com/libp2p/go-libp2p go-github-com-quic-go-quic-go ; github.com/libp2p/go-libp2p + go-github-com-whyrusleeping-base32 ; github.com/ipfs/boxo + go-github-com-whyrusleeping-cbor ; github.com/ipld/go-car + go-github-com-whyrusleeping-chunker ; github.com/ipfs/boxo + go-github-com-whyrusleeping-go-keyspace ; github.com/libp2p/go-libp2p-kad-dht go-golang-org-x-oauth2 ; github.com/ipfs/boxo go-golang-org-x-term ; github.com/ipfs/go-ipfs-cmds go-golang-org-x-xerrors ; github.com/whyrusleeping/cbor-gen diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm index 7cfea42938..a298a5799c 100644 --- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -366,14 +366,14 @@ Conferencing} and @acronym{ICB, Internet Citizen's Band}.") (define-public weechat (package (name "weechat") - (version "4.3.3") + (version "4.3.5") (source (origin (method url-fetch) (uri (string-append "https://weechat.org/files/src/weechat-" version ".tar.xz")) (sha256 (base32 - "1n2y20mv7nj4n71qmzvnr87qxh4zkv8acihw23d5p29kx9ndp1sm")))) + "1qsbdg3c0787xs0vwbxsyylf5fvz4cazrzlnwj2mnp6s6b4c9nz6")))) (build-system cmake-build-system) (outputs '("out" "doc")) (native-inputs @@ -924,11 +924,11 @@ building block for other projects.") (base32 "1ag5x7h71pxjaaf4b561rwdqr05zzywkc0p3jf2yhg3lbjkjrc7z")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; There are no tests. - #:make-flags - (list - (string-append "CC=" ,(cc-for-target)) - (string-append "PREFIX=" %output)))) + (list #:tests? #f ; There are no tests. + #:make-flags + #~(list + (string-append "CC=" #$(cc-for-target)) + (string-append "PREFIX=" #$output)))) (native-inputs (list pkg-config universal-ctags)) (inputs @@ -1108,7 +1108,6 @@ what.") (build-system go-build-system) (arguments (list - #:go go-1.19 #:install-source? #f #:import-path "git.sr.ht/~emersion/soju" #:phases diff --git a/gnu/packages/javascript.scm b/gnu/packages/javascript.scm index fba96b06a8..4f97dcfef6 100644 --- a/gnu/packages/javascript.scm +++ b/gnu/packages/javascript.scm @@ -778,7 +778,7 @@ animating a series of images.") (define-public mujs (package (name "mujs") - (version "1.3.2") + (version "1.3.5") (source (origin (method git-fetch) @@ -787,7 +787,7 @@ animating a series of images.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1kfp2246pzmrb65c0gfcy130zd7sbniclpjx2jv6jbkmpkjs8kb1")) + (base32 "1p90cb830li6y38m748s4kz2pkimxarbcaym3bwrxnk3jaqcf69q")) (snippet #~(begin (use-modules (guix build utils)) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 08329820fa..002461282f 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -87,6 +87,7 @@ #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages python-web) #:use-module (gnu packages qt) #:use-module (gnu packages textutils) #:use-module (gnu packages tls) @@ -103,7 +104,7 @@ (define-public extra-cmake-modules (package (name "extra-cmake-modules") - (version "6.0.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -112,7 +113,7 @@ name "-" version ".tar.xz")) (sha256 (base32 - "030dyw4krnq8hcp0dsqb15zxb7x7r8c33lbdgmmia5xpkpqjp693")))) + "067qb9w8dj5z094yklc9b1jx5k29my5zf1gzkr05liswm7xzhs0k")))) (build-system cmake-build-system) (native-inputs ;; Add test dependency, except on armhf where building it is too @@ -160,12 +161,12 @@ "set(ECM_MKSPECS_INSTALL_DIR lib/qt${QT_MAJOR_VERSION}/mkspecs/modules")))) ;; Work around for the failed test KDEFetchTranslations. ;; It complains that the cmake project name is not - ;; "frameworks/extra-cmake-modules". + ;; ".*/extra-cmake-modules". ;; TODO: Fix it upstream. (add-after 'unpack 'fix-test (lambda _ (substitute* "tests/KDEFetchTranslations/CMakeLists.txt" - (("frameworks/extra-cmake-modules") "extra-cmake-modules")))) + (("\\.\\*/extra-cmake-modules") "extra-cmake-modules")))) ;; install and check phase are swapped to prevent install from failing ;; after testsuire has run (add-after 'install 'check-post-install @@ -189,7 +190,7 @@ common build settings used in software produced by the KDE community.") (define-public kquickcharts (package (name "kquickcharts") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/frameworks/" @@ -197,7 +198,32 @@ common build settings used in software produced by the KDE community.") "/" name "-" version ".tar.xz")) (sha256 (base32 - "1f91x92qdzxp31z7ixx9jn41hq9f3w9hjia94pab9vsnaz8prbd1")))) + "1iwgxlzplpb1ngc2q3jv5v5a2dq3l9wc6kizfvrb6j5zvwm543i5")))) + (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) + (native-inputs (list extra-cmake-modules glslang pkg-config)) + (inputs (list qtdeclarative qtshadertools)) + (home-page "https://api.kde.org/frameworks/kquickcharts/html/index.html") + (synopsis "QtQuick plugin providing high-performance charts") + (description + "The Quick Charts module provides a set of charts that can be +used from QtQuick applications for both simple display of data as well as +continuous display of high-volume data.") + (license (list license:lgpl2.1 license:lgpl3)))) + +(define-public kquickcharts-5 + (package + (inherit kquickcharts) + (name "kquickcharts") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/frameworks/" + (version-major+minor version) + "/" name "-" version ".tar.xz")) + (sha256 + (base32 + "1bd20kpypji6053fwn5a1b41rjf7r1b3wk85swb0xlmm2kji236j")))) (build-system cmake-build-system) (arguments (list #:phases #~(modify-phases %standard-phases @@ -209,15 +235,7 @@ common build settings used in software produced by the KDE community.") (setenv "QT_QPA_PLATFORM" "offscreen") (invoke "ctest"))))))) (inputs (list qtbase-5 qtdeclarative-5 qtquickcontrols2-5 - xorg-server-for-tests)) - (native-inputs (list extra-cmake-modules glslang pkg-config)) - (home-page "https://api.kde.org/frameworks/kquickcharts/html/index.html") - (synopsis "QtQuick plugin providing high-performance charts") - (description - "The Quick Charts module provides a set of charts that can be -used from QtQuick applications for both simple display of data as well as -continuous display of high-volume data.") - (license (list license:lgpl2.1 license:lgpl3)))) + xorg-server-for-tests)))) (define-public phonon (package @@ -234,22 +252,11 @@ continuous display of high-volume data.") "16pk8g5rx00x45gnxrqg160b1l02fds1b7iz6shllbfczghgz1rj")))) (build-system cmake-build-system) (native-inputs - ;; TODO: Add building the super experimental QML support - (list appstream extra-cmake-modules pkg-config qttools-5)) - (inputs (list glib qtbase-5 pulseaudio)) + (list appstream extra-cmake-modules pkg-config qttools)) + (inputs (list qtbase qt5compat glib qtbase-5 pulseaudio)) (arguments (list #:configure-flags - #~'("-DCMAKE_CXX_FLAGS=-fPIC" - "-DPHONON_BUILD_QT6=OFF") ;KDE is still using Qt 5 - #:phases - #~(modify-phases %standard-phases - (add-before 'install 'patch-installdir - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((regex (string-append "(INSTALL DESTINATION \")" - #$(this-package-input "qtbase")))) - (substitute* "cmake_install.cmake" - ((regex all dest) - (string-append dest #$output))))))))) + #~(list "-DCMAKE_CXX_FLAGS=-fPIC"))) (home-page "https://community.kde.org/Phonon") (synopsis "KDE's multimedia library") (description "KDE's multimedia library.") @@ -324,7 +331,7 @@ Phonon-VLC is a backend based on the VLC multimedia library.") (define-public attica (package (name "attica") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -333,8 +340,11 @@ Phonon-VLC is a backend based on the VLC multimedia library.") name "-" version ".tar.xz")) (sha256 (base32 - "0gkdsm1vyyyxxyl4rni9s2bdz5w6zphzjl58fddjl899da06hqfq")))) + "1varrhc08799avraaln5sa844mwcz4h519x36n25sb80788kmbxb")))) (build-system cmake-build-system) + (native-inputs + (list extra-cmake-modules)) + (inputs (list qtbase)) (arguments (list #:phases @@ -344,10 +354,6 @@ Phonon-VLC is a backend based on the VLC multimedia library.") ;; These tests require network access. (substitute* "autotests/CMakeLists.txt" ((".*providertest.cpp") ""))))))) - (native-inputs - (list extra-cmake-modules)) - (inputs - (list qtbase-5)) (home-page "https://community.kde.org/Frameworks") (synopsis "Open Collaboration Service client library") (description "Attica is a Qt library that implements the Open @@ -362,10 +368,26 @@ The REST API is defined here: http://freedesktop.org/wiki/Specifications/open-collaboration-services/") (license (list license:lgpl2.1+ license:lgpl3+)))) +(define-public attica-5 + (package + (inherit attica) + (name "attica") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1shzs985fimd15w2d9cxpcbq7by33v05hb00rp79k6cqvp20f4b8")))) + (inputs (list qtbase-5)))) + (define-public bluez-qt (package (name "bluez-qt") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -374,24 +396,24 @@ http://freedesktop.org/wiki/Specifications/open-collaboration-services/") name "-" version ".tar.xz")) (sha256 (base32 - "1ni50jwnb5ww8mkql0p3q8660c0srj8p0ik27lvxakwdq4wf6l9s")))) + "1p52sk0rpf75dhmwcxbiwnpprm8giy80qav92d1dhchhmqzvhs1v")))) (build-system cmake-build-system) (native-inputs (list dbus extra-cmake-modules)) (inputs - (list qtdeclarative-5 - qtbase-5)) + (list qtdeclarative + qtbase)) (arguments (list #:configure-flags #~(list (string-append "-DUDEV_RULES_INSTALL_DIR=" #$output "/lib/udev/rules.d")) - #:phases - #~(modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (setenv "DBUS_FATAL_WARNINGS" "0") - (invoke "dbus-launch" "ctest" "-E" "bluezqt-qmltests"))))))) + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "DBUS_FATAL_WARNINGS" "0") + (invoke "dbus-launch" "ctest" "-E" "bluezqt-qmltests"))))))) (home-page "https://community.kde.org/Frameworks") (synopsis "QML wrapper for BlueZ") (description "bluez-qt is a Qt-style library for accessing the bluez @@ -401,7 +423,7 @@ Bluetooth stack. It is used by the KDE Bluetooth stack, BlueDevil.") (define-public breeze-icons (package (name "breeze-icons") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/frameworks/" @@ -409,7 +431,7 @@ Bluetooth stack. It is used by the KDE Bluetooth stack, BlueDevil.") "/" name "-" version ".tar.xz")) (sha256 (base32 - "0z5cpv10jyjdwjfkm7nj6hyp4vj29apm476hvbpb4gan27jyb91y")))) + "09p6fjja5yqf1zvfjdik997clnhbyd1xx4gnqhyz3nypy9w669k7")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules @@ -417,7 +439,7 @@ Bluetooth stack. It is used by the KDE Bluetooth stack, BlueDevil.") `(,gtk+ "bin") python python-lxml)) ;for 24x24 icon generation - (inputs (list qtbase-5)) + (inputs (list qtbase)) (arguments (list #:phases #~(modify-phases %standard-phases (add-after 'install 'update-cache @@ -429,9 +451,9 @@ Bluetooth stack. It is used by the KDE Bluetooth stack, BlueDevil.") (string-append #$output "/share/icons/breeze-dark"))))))) (home-page "https://community.kde.org/Frameworks") - (synopsis "Default KDE Plasma 5 icon theme") + (synopsis "Default KDE Plasma icon theme") (description "Breeze provides a freedesktop.org compatible icon theme. -It is the default icon theme for the KDE Plasma 5 desktop.") +It is the default icon theme for the KDE Plasma desktop.") ;; The license file mentions lgpl3+. The license files in the source ;; directories are lgpl3, while the top directory contains the lgpl2.1. ;; text. @@ -440,7 +462,7 @@ It is the default icon theme for the KDE Plasma 5 desktop.") (define-public kapidox (package (name "kapidox") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -449,7 +471,7 @@ It is the default icon theme for the KDE Plasma 5 desktop.") name "-" version ".tar.xz")) (sha256 (base32 - "0xxw3lvipyax8r1af3ypwjj6waarbp2z9n11fjb4kvyigsypglmb")))) + "0knp680462dr9ib2b4dgz18659i1a33d6gmvnqh3k4mm659rrlr1")))) (build-system python-build-system) (arguments (list #:tests? #f ; test need network @@ -460,9 +482,9 @@ It is the default icon theme for the KDE Plasma 5 desktop.") ;; TODO: check if doxygen has to be installed, the readme does not ;; mention it. The openSuse .rpm lists doxygen, graphviz, graphviz-gd, ;; and python-xml. - (list python python-jinja2 python-pyyaml)) + (list python python-jinja2 python-pyyaml python-requests)) (inputs - (list qtbase-5)) + (list qtbase)) (home-page "https://community.kde.org/Frameworks") (synopsis "KDE Doxygen Tools") (description "This framework contains scripts and data for building API @@ -480,7 +502,7 @@ documentation.") (define-public karchive (package (name "karchive") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/frameworks/" @@ -488,7 +510,7 @@ documentation.") "/" name "-" version ".tar.xz")) (sha256 (base32 - "015gc1zarny8r478p7g9m6r67l5dk3r0vcp28ilmfmznxy0k0hda")))) + "0aafcxizxzh239sz9ffsgxbq6c4a368bm3l93jj9m3v60xbpz017")))) (build-system cmake-build-system) (arguments (list #:phases #~(modify-phases %standard-phases @@ -497,27 +519,45 @@ documentation.") (when tests? (invoke "ctest" "-E" "karchivetest"))))))) (native-inputs - (list extra-cmake-modules pkg-config qttools-5)) - (inputs - (list bzip2 qtbase-5 xz zlib `(,zstd "lib"))) - (home-page "https://community.kde.org/Frameworks") - (synopsis "Qt 5 addon providing access to numerous types of archives") + (list extra-cmake-modules pkg-config qttools)) + (inputs (list bzip2 qtbase xz zlib `(,zstd "lib"))) + (synopsis "Qt 6 addon providing access to numerous types of archives") (description "KArchive provides classes for easy reading, creation and manipulation of @code{archive} formats like ZIP and TAR. It also provides transparent compression and decompression of data, like the GZip format, via a subclass of QIODevice.") + (home-page "https://community.kde.org/Frameworks") ;; The included licenses is are gpl2 and lgpl2.1, but the sources are ;; under a variety of licenses. ;; This list is taken from http://packaging.neon.kde.org/cgit/ (license (list license:lgpl2.1 license:lgpl2.1+ license:lgpl3+ license:bsd-2)))) +(define-public karchive-5 + (package + (inherit karchive) + (name "karchive") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/frameworks/" + (version-major+minor version) + "/" name "-" version ".tar.xz")) + (sha256 + (base32 + "02m3vvw58qsgmaps184xwy97bg4pgjl4i1gjwzn66h5qf34y6qqn")))) + (native-inputs + (list extra-cmake-modules pkg-config qttools-5)) + (inputs + (list bzip2 qtbase-5 xz zlib `(,zstd "lib"))) + (synopsis "Qt 5 addon providing access to numerous types of archives"))) + (define-public kcalendarcore (package (name "kcalendarcore") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -526,24 +566,17 @@ GZip format, via a subclass of QIODevice.") name "-" version ".tar.xz")) (sha256 (base32 - "0aimda01zqw4fz5ldvz4vh767bi10r00kvm62n89nxhsq46wlk7p")))) + "1yqk2s52h6z9jlh2lg96agk273msrah6rxw10wr2cpnb0jv7dpyd")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules perl tzdata-for-tests)) - (inputs - (list libical qtbase-5)) + (inputs (list libical qtbase)) (arguments (list #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'disable-failing-test - (lambda _ - ;; Reported as https://bugs.kde.org/show_bug.cgi?id=484306 - (substitute* "autotests/CMakeLists.txt" - (("testdateserialization") - "")))) (add-before 'check 'check-setup - (lambda* (#:key inputs #:allow-other-keys) ;;; XXX: failing test + (lambda* (#:key inputs #:allow-other-keys) (setenv "QT_QPA_PLATFORM" "offscreen") (setenv "TZ" "Europe/Prague") (setenv "TZDIR" @@ -564,7 +597,7 @@ and the older vCalendar.") (define-public kcodecs (package (name "kcodecs") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -573,10 +606,10 @@ and the older vCalendar.") name "-" version ".tar.xz")) (sha256 (base32 - "080zvcqd8iq05p5x3qaf3rryx75lg2l2j1dr18sp50ir50zfwh2w")))) + "1v665sr76020yix4f2kkwrjz46lh0jyc4wdrzr1xairxzhd560k9")))) (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)) + (inputs (list qtbase)) (home-page "https://community.kde.org/Frameworks") (synopsis "String encoding and manipulating library") (description "KCodecs provide a collection of methods to manipulate @@ -593,6 +626,23 @@ Internet).") license:lgpl2.1 license:lgpl2.1+ license:expat license:lgpl3+ license:mpl1.1)))) +(define-public kcodecs-5 + (package + (inherit kcodecs) + (name "kcodecs") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "03k8scmswxhx7bng5fh3niq84gqzksb19sf6ah4bdz6aj4pd52d4")))) + (native-inputs (list extra-cmake-modules gperf qttools-5)) + (inputs (list qtbase-5)))) + (define-public kcolorpicker (package (name "kcolorpicker") @@ -608,9 +658,10 @@ Internet).") (base32 "1px40rasvz0r5db9av125q9mlyjz4xdnckg2767i3fndj3ic0vql")))) (build-system qt-build-system) - (propagated-inputs (list qtbase-5)) (arguments - (list #:configure-flags #~'("-DBUILD_TESTS=ON"))) + (list #:qtbase qtbase + #:configure-flags #~(list "-DBUILD_TESTS=ON" + "-DBUILD_WITH_QT6=ON"))) (home-page "https://github.com/ksnip/kColorPicker") (synopsis "Color Picker with popup menu") (description @@ -619,10 +670,40 @@ menu which lets you select a color. The popup features a color dialog button which can be used to add custom colors to the popup menu.") (license license:lgpl3+))) +(define-public kcolorscheme + (package + (name "kcolorscheme") + (version "6.3.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + + (sha256 + (base32 + "0dch0iv6kkbzc7cl5fbcls1ll2h4jdd16kv9g5d9y041ryyk05ri")))) + (build-system qt-build-system) + (native-inputs (list extra-cmake-modules)) + (inputs (list kguiaddons ki18n + qtdeclarative)) + (propagated-inputs (list kconfig)) + (arguments (list #:qtbase qtbase)) + (synopsis "Classes to read and interact with KColorScheme") + (description "This package provide a Classes to read and interact with +KColorScheme.") + (home-page "https://community.kde.org/Frameworks") + (license (list license:cc0 + license:lgpl2.0+ + license:lgpl2.1 + license:bsd-2 + license:lgpl3)))) + (define-public kconfig (package (name "kconfig") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -631,23 +712,31 @@ which can be used to add custom colors to the popup menu.") name "-" version ".tar.xz")) (sha256 (base32 - "0hghdh4p6cq9ckp4g5jdgd8w47pdsxxvzimrdfjrs71lmy8ydiy2")))) - (build-system cmake-build-system) + "0ybr5l0b9wvzkh3546s3dnv2di0vf3rcf0f6jzbyqlaigfprm04d")))) + (build-system qt-build-system) (native-inputs - (list dbus extra-cmake-modules inetutils qttools-5 - xorg-server-for-tests)) - (inputs - (list qtbase-5 qtdeclarative-5)) + (list dbus extra-cmake-modules inetutils qttools)) + (propagated-inputs (list qtdeclarative)) (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? ;; kconfigcore-kconfigtest fails inconsistently!! - (setenv "HOME" (getcwd)) - (setenv "QT_QPA_PLATFORM" "offscreen") - (invoke "ctest" "-E" "(kconfigcore-kconfigtest|\ -kconfiggui-kstandardshortcutwatchertest)"))))))) + (list + #:qtbase qtbase + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'check-setup + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (with-output-to-file "autotests/BLACKLIST" + (lambda _ + (for-each + (lambda (name) + (display (string-append "[" name "]\n*\n"))) + (list "testNotifyIllegalObjectPath" + "testLocalDeletion" + "testNotify" + "testSignal" + "testDataUpdated")))) + (setenv "HOME" (getcwd)) + (setenv "QT_QPA_PLATFORM" "offscreen"))))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Kconfiguration settings framework for Qt") (description "KConfig provides an advanced configuration system. @@ -679,10 +768,11 @@ propagate their changes to their respective configuration files.") license:lgpl3+ license:gpl1 ; licende:mit-olif license:bsd-2 license:bsd-3)))) -(define-public kcoreaddons +(define-public kconfig-5 (package - (name "kcoreaddons") - (version "5.114.0") + (inherit kconfig) + (name "kconfig") + (version "5.116.0") (source (origin (method url-fetch) (uri (string-append @@ -691,15 +781,43 @@ propagate their changes to their respective configuration files.") name "-" version ".tar.xz")) (sha256 (base32 - "1wv3s3xsiii96k17nzs2fb0ih2lyg52krf58v44nlk9wfi4wmnqx")))) - (build-system cmake-build-system) + "03j7cw0c05rpxrnblrc5ziq7vy1v193l5gj9bix1dakkj9hf6p9c")))) (native-inputs - (list extra-cmake-modules qttools-5 shared-mime-info)) - ;; TODO: FAM: File alteration notification http://oss.sgi.com/projects/fam + (list dbus extra-cmake-modules inetutils qttools-5 + xorg-server-for-tests)) (inputs - (list qtbase-5)) + (list qtdeclarative-5)) + (propagated-inputs '()) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? ;; kconfigcore-kconfigtest fails inconsistently!! + (setenv "HOME" (getcwd)) + (setenv "QT_QPA_PLATFORM" "offscreen") + (invoke "ctest" "-E" "(kconfigcore-kconfigtest|\ +kconfiggui-kstandardshortcutwatchertest)"))))))))) + +(define-public kcoreaddons + (package + (name "kcoreaddons") + (version "6.3.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0mn7qmfcics12w979q7gis3yn1w79fhzrxl30pv5y5x1qax97fxq")))) + (build-system qt-build-system) + (native-inputs (list extra-cmake-modules qttools shared-mime-info)) + (inputs (list qtdeclarative)) (arguments (list + #:qtbase qtbase #:phases #~(modify-phases %standard-phases (add-before 'check 'blacklist-failing-test @@ -725,10 +843,82 @@ manipulations such as macro replacement, accessing user information and many more.") (license (list license:lgpl2.0+ license:lgpl2.1+)))) +(define-public kcoreaddons-5 + (package + (inherit kcoreaddons) + (name "kcoreaddons") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0x1inzglgpz2z2w25bp46hzjv74gp3vyd3i911xczz7wd30b9yyy")))) + (build-system cmake-build-system) + (native-inputs + (list extra-cmake-modules qttools-5 shared-mime-info)) + (inputs + (list qtbase-5)) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'blacklist-failing-test + (lambda _ + ;; Blacklist failing tests. + (with-output-to-file "autotests/BLACKLIST" + (lambda _ + ;; FIXME: Make it pass. Test failure caused by stout/stderr + ;; being interleaved. + (display "[test_channels]\n*\n") + ;; FIXME + (display "[test_inheritance]\n*\n"))))) + (add-before 'check 'check-setup + (lambda _ + (setenv "HOME" (getcwd)) + (setenv "TMPDIR" (getcwd))))))))) + (define-public kdbusaddons (package (name "kdbusaddons") - (version "5.114.0") + (version "6.3.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "00i08baairndj5w6x3rhfxcws0xjd59wn2h08am3ll89xycqjbby")))) + (build-system qt-build-system) + (native-inputs + (list extra-cmake-modules dbus qttools)) + (inputs (list libxkbcommon)) + (arguments + (list #:qtbase qtbase + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "dbus-launch" "ctest"))))))) + (home-page "https://community.kde.org/Frameworks") + (synopsis "Convenience classes for DBus") + (description "KDBusAddons provides convenience classes on top of QtDBus, +as well as an API to create KDED modules.") + ;; Some source files mention lgpl2.0+, but the included license is + ;; the lgpl2.1. Some source files are under non-copyleft licenses. + (license license:lgpl2.1+))) + +(define-public kdbusaddons-5 + (package + (inherit kdbusaddons) + (name "kdbusaddons") + (version "5.116.0") (source (origin (method url-fetch) (uri (string-append @@ -737,7 +927,7 @@ many more.") name "-" version ".tar.xz")) (sha256 (base32 - "0pzzznyxhi48z5hhdsdxz3vaaihrdshpx65ha2v2nn2gh3ww7ikm")))) + "0mlfphk8knbvpyns3ixd8da9zjvsms29mv5z2xgif9y20i5kmdq3")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules dbus qttools-5)) @@ -761,19 +951,25 @@ many more.") (lambda* (#:key tests? #:allow-other-keys) (when tests? (setenv "DBUS_FATAL_WARNINGS" "0") - (invoke "dbus-launch" "ctest"))))))) - (home-page "https://community.kde.org/Frameworks") - (synopsis "Convenience classes for DBus") - (description "KDBusAddons provides convenience classes on top of QtDBus, -as well as an API to create KDED modules.") - ;; Some source files mention lgpl2.0+, but the included license is - ;; the lgpl2.1. Some source files are under non-copyleft licenses. - (license license:lgpl2.1+))) + (invoke "dbus-launch" "ctest"))))))))) + +(define kdbusaddons-5-bootstrap + (package + (inherit kdbusaddons-5) + (source (origin + (inherit (package-source kdbusaddons-5)) + (patches '()))) + (inputs (modify-inputs (package-inputs kdbusaddons-5) (delete "kinit"))) + (arguments + (substitute-keyword-arguments (package-arguments kdbusaddons-5) + ((#:phases phases) + #~(modify-phases #$phases + (delete 'patch-source))))))) (define-public kdnssd (package (name "kdnssd") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -782,13 +978,13 @@ as well as an API to create KDED modules.") name "-" version ".tar.xz")) (sha256 (base32 - "1zw5rkprr54j05ic8zljk57zahp2v6333slr253r3n1679zqlv64")))) + "0akip5sb8jva760lprxd3qbzlx9ql3vgdxdl1rblp5qsvv94h7b7")))) (build-system cmake-build-system) (native-inputs - (list extra-cmake-modules qttools-5)) + (list extra-cmake-modules qttools)) (inputs (list avahi ; alternativly dnssd could be used - qtbase-5)) + qtbase)) (home-page "https://community.kde.org/Frameworks") (synopsis "Network service discovery using Zeroconf") (description "KDNSSD is a library for handling the DNS-based Service @@ -797,10 +993,29 @@ such as printers, to be discovered without any user intervention or centralized infrastructure.") (license license:lgpl2.1+))) +(define-public kdnssd-5 + (package + (inherit kdnssd) + (name "kdnssd") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1z2xyir6xvyyq3j48wmra3zka6hlpjr2rnfc4gbijl0aazv6srrm")))) + (native-inputs + (list extra-cmake-modules qttools-5)) + (inputs + (list avahi qtbase-5)))) + (define-public kgraphviewer (package (name "kgraphviewer") - (version "2.4.3") + (version "2.5.0") (source (origin (method url-fetch) (uri (string-append @@ -808,15 +1023,17 @@ infrastructure.") version "/" name "-" version ".tar.xz")) (sha256 (base32 - "1h6pgg89gvxl8gw7wmkabyqqrzad5pxyv5lsmn1fl4ir8lcc5q2l")))) + "0s9b3q7wvrbz52d500mcaflkrfjwhbzh5bsf5gxzgxjdzdiywaw7")))) (build-system cmake-build-system) (inputs - (list qtbase-5 + (list qtbase boost graphviz + ki18n kiconthemes kparts - qtsvg-5)) + qtsvg + qt5compat)) (native-inputs (list pkg-config extra-cmake-modules kdoctools)) (home-page "https://apps.kde.org/kgraphviewer/") @@ -828,7 +1045,7 @@ replace the other outdated Graphviz tools.") (define-public kguiaddons (package (name "kguiaddons") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -837,39 +1054,56 @@ replace the other outdated Graphviz tools.") name "-" version ".tar.xz")) (sha256 (base32 - "0riya9plcz9c1ndhdbsradssndshbm12705swn7vf7am17n7f947")))) + "009jvkakgb44ykz3920pj87kxh9jgbp9mdi654f77hqyq0grnlg1")))) (build-system qt-build-system) ;; TODO: Build packages for the Python bindings. Ideally this will be ;; done for all versions of python guix supports. Requires python, ;; python-sip, clang-python, libclang. Requires python-2 in all cases for ;; clang-python. - (native-inputs - (list extra-cmake-modules pkg-config)) + (native-inputs (list extra-cmake-modules pkg-config)) (inputs - (list qtbase-5 qtwayland-5 qtx11extras plasma-wayland-protocols wayland)) + (list libxkbcommon qtwayland plasma-wayland-protocols wayland)) + (arguments (list #:qtbase qtbase)) (home-page "https://community.kde.org/Frameworks") (synopsis "Utilities for graphical user interfaces") (description "The KDE GUI addons provide utilities for graphical user interfaces in the areas of colors, fonts, text, images, keyboard input.") (license (list license:gpl2+ license:lgpl2.1+)))) +(define-public kguiaddons-5 + (package + (inherit kguiaddons) + (name "kguiaddons") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1rpw6glgchf7qs4rh7jxy9sas73708yllba1q880gdicn1nda42w")))) + (native-inputs (list extra-cmake-modules pkg-config)) + (arguments '()) + (inputs + (list qtwayland-5 qtx11extras plasma-wayland-protocols wayland)))) + (define-public kholidays (package (name "kholidays") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/frameworks/" (version-major+minor version) "/" name "-" version ".tar.xz")) - (sha256 - (base32 "19r8dxglz5ll6iyvigsccil3ikvcsnyy5nwcpjvjr1c0brigcjmy")))) + (sha256 + (base32 "0pmcrzkq1s3aisihicazxgammmqmc63ywf6b0lwdb89xqwcf36cz")))) (build-system cmake-build-system) - (native-inputs - (list extra-cmake-modules qttools-5)) - (inputs - (list qtbase-5 qtdeclarative-5)) + (native-inputs (list extra-cmake-modules qttools)) + (inputs (list qtbase qtdeclarative)) (home-page "https://invent.kde.org/frameworks/kholidays") (synopsis "Library for regional holiday information") (description "This library provides a C++ API that determines holiday and @@ -879,7 +1113,7 @@ other special events for a geographical region.") (define-public ki18n (package (name "ki18n") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -888,23 +1122,25 @@ other special events for a geographical region.") name "-" version ".tar.xz")) (sha256 (base32 - "1yg03awcx5ay6lgbgwv91i0ankrm94z9m0wky4v03gnwnvw8pa0v")))) + "10kjjl6af3kbp0zs4pny6wrl5a7ld05fp5hkj31zww10p8g395ad")))) (build-system cmake-build-system) (propagated-inputs - (list gettext-minimal python)) + (list gettext-minimal)) (native-inputs - (list extra-cmake-modules)) + (list extra-cmake-modules python-minimal tzdata-for-tests)) (inputs - (list qtbase-5 qtdeclarative-5 qtscript iso-codes)) + (list qtbase qtdeclarative iso-codes)) (arguments - (list #:phases #~(modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (setenv "HOME" - (getcwd)) - (invoke "ctest" "-E" - "(kcountrytest|kcountrysubdivisiontest)"))))))) + (list + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "HOME" + (getcwd)) + (invoke "ctest" "-E" + "(kcountrytest|kcountrysubdivisiontest)"))))))) (home-page "https://community.kde.org/Frameworks") (synopsis "KDE Gettext-based UI text internationalization") (description "KI18n provides functionality for internationalizing user @@ -918,10 +1154,11 @@ translated text. This includes argument capturing, customizable markup, and translation scripting.") (license license:lgpl2.1+))) -(define-public kidletime +(define-public ki18n-5 (package - (name "kidletime") - (version "5.114.0") + (inherit ki18n) + (name "ki18n") + (version "5.116.0") (source (origin (method url-fetch) (uri (string-append @@ -930,13 +1167,38 @@ translation scripting.") name "-" version ".tar.xz")) (sha256 (base32 - "06sc9w54g4n7s5gjkqz08rgcz6v3pr0bdgx3gbjgzass6l4m8w7p")))) + "1kbb3rq85hbw1h5bd1w9cmdgz8bdg47w9b133ha41qlhh1i50clk")))) + (propagated-inputs + (list gettext-minimal python)) + (native-inputs + (list extra-cmake-modules)) + (inputs + (list qtbase-5 qtdeclarative-5 qtscript iso-codes)))) + +(define-public kidletime + (package + (name "kidletime") + (version "6.3.0") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 "0ba74qa3p8qfmv2k1mq9wh00yih331y0wzc1i0mk8f37rry6g3yd")))) (build-system cmake-build-system) (native-inputs - (list extra-cmake-modules pkg-config)) + (list extra-cmake-modules pkg-config + ;; for wayland-scanner + wayland)) (inputs - (list libxscrnsaver ; X-Screensaver based poller, fallback mode - qtbase-5 qtx11extras)) + (list qtbase + qtwayland + wayland + plasma-wayland-protocols + wayland-protocols + libxkbcommon)) (home-page "https://community.kde.org/Frameworks") (synopsis "Reporting of idle time of user and system") (description "KIdleTime is a singleton reporting information on idle time. @@ -945,36 +1207,49 @@ but also for getting notified upon idle time events, such as custom timeouts, or user activity.") (license (list license:gpl2+ license:lgpl2.1+)))) +(define-public kidletime-5 + (package + (inherit kidletime) + (name "kidletime") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "15s9nxpkqy3i182xk82bpl92iaqcilsckja7301854fw6ppl8vvh")))) + (native-inputs + (list extra-cmake-modules pkg-config)) + (inputs + (list libxscrnsaver ; X-Screensaver based poller, fallback mode + qtbase-5 qtx11extras)))) + (define-public kirigami - ;; Kirigami is listed as tier 1 framework, but optionally includes - ;; plasma-framework which is tier 3. (package (name "kirigami") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/frameworks/" (version-major+minor version) "/" - "kirigami2-" version ".tar.xz")) + "kirigami-" version ".tar.xz")) (sha256 (base32 - "1bd232gs4394fa3aq31mjqrn8f3vjsghx7817szi7ryvnn6fnqkw")))) - (properties `((upstream-name . "kirigami2"))) + "0nrrnbf7hmis6sbqilmqf6wgjyvg5zwzlkcgzq0kbh1pbfhgmjyv")))) (build-system cmake-build-system) (native-inputs - (list extra-cmake-modules qttools-5)) + (list extra-cmake-modules qttools)) (inputs (list kwindowsystem - ;; TODO: Find a way to activate this optional include without - ;; introducing a recursive dependency. - ;;("plasma-frameworks" ,plasma-framework) ;; Tier 3! - qtbase-5 - qtdeclarative-5 - qtquickcontrols2-5 - qtsvg-5 - ;; Run-time dependency - qtgraphicaleffects)) + qtshadertools + qtbase + qtdeclarative + qtsvg + libxkbcommon)) (home-page "https://community.kde.org/Frameworks") (synopsis "QtQuick components for mobile user interfaces") (description "Kirigami is a set of high level QtQuick components looking @@ -982,10 +1257,36 @@ and feeling well on both mobile and desktop devices. They ease the creation of applications that follow the Kirigami Human Interface Guidelines.") (license license:lgpl2.1+))) +(define-public kirigami-5 + (package + (inherit kirigami) + (name "kirigami") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + "kirigami2-" version ".tar.xz")) + (sha256 + (base32 + "1q69b1qd2qs9hpwgw0y0ig93ag41l50dghribsnqhi0c9aklsn4b")))) + (native-inputs + (list extra-cmake-modules qttools-5)) + (inputs + (list kwindowsystem-5 + qtbase-5 + qtdeclarative-5 + qtquickcontrols2-5 + qtsvg-5 + ;; Run-time dependency + qtgraphicaleffects)) + (properties `((upstream-name . "kirigami2"))))) + (define-public kitemmodels (package (name "kitemmodels") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -994,12 +1295,12 @@ of applications that follow the Kirigami Human Interface Guidelines.") name "-" version ".tar.xz")) (sha256 (base32 - "1bfmcrbcbrvp2rcaf32vzvarqwp41gn6s4xpf56hnxbwf9kgk1fl")))) + "1fmcas5n3ylgzjlmwhcnqpsm46p50zia4xzvnf5iz74icbxq9adk")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) - (inputs - (list qtbase-5 qtdeclarative-5)) + (inputs (list qtdeclarative)) + (arguments (list #:qtbase qtbase)) (home-page "https://community.kde.org/Frameworks") (synopsis "Set of item models extending the Qt model-view framework") (description "KItemModels provides the following models: @@ -1032,10 +1333,30 @@ model to observers @end enumerate") (license license:lgpl2.1+))) +(define-public kitemmodels-5 + (package + (inherit kitemmodels) + (name "kitemmodels") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1wcznkj24553spkl202zwifk6hgrvdd60j3y47jp2m6zpadywz2k")))) + (native-inputs + (list extra-cmake-modules)) + (inputs + (list qtdeclarative-5)) + (arguments '()))) + (define-public kitemviews (package (name "kitemviews") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -1044,12 +1365,11 @@ model to observers name "-" version ".tar.xz")) (sha256 (base32 - "00vl2ck0pq0sqcxvhlr2pimgr27hd9v7y9dz6w4arb5smi5q1ixg")))) + "0byllbqxk2q4svxh1pim8jm6n2qimh5gp9h0m0s1hqqiaqapsrfq")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules qttools-5)) - (inputs - (list qtbase-5)) + (list extra-cmake-modules qttools)) + (arguments (list #:qtbase qtbase)) (home-page "https://community.kde.org/Frameworks") (synopsis "Set of item views extending the Qt model-view framework") (description "KItemViews includes a set of views, which can be used with @@ -1057,10 +1377,28 @@ item models. It includes views for categorizing lists and to add search filters to flat and hierarchical lists.") (license (list license:gpl2+ license:lgpl2.1+)))) +(define-public kitemviews-5 + (package + (inherit kitemviews) + (name "kitemviews") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1sq1kvqb9g0gzlyfyix9xsjq6wl2i1s3mfqkpdc0rdns13sgn3kc")))) + (native-inputs + (list extra-cmake-modules qttools-5)) + (arguments '()))) + (define-public kplotting (package (name "kplotting") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -1069,12 +1407,11 @@ to flat and hierarchical lists.") name "-" version ".tar.xz")) (sha256 (base32 - "17x58pplln0plqiyhjpzdiqxngylxq5gkc5gk7b91xzm783x2k0n")))) + "08cmp86h7pwjsds2kdcnnab8nincnmp72irk9y9ansqfglsgmrzq")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules qttools-5)) - (inputs - (list qtbase-5)) + (list extra-cmake-modules qttools)) + (arguments (list #:qtbase qtbase)) (home-page "https://community.kde.org/Frameworks") (synopsis "Data plotting library") (description "KPlotWidget is a QWidget-derived class that provides a virtual @@ -1084,10 +1421,48 @@ data being plotted. KPlotWidget automatically converts everything to screen pixel units.") (license license:lgpl2.1+))) +(define-public ksvg + (package + (name "ksvg") + (version "6.3.1") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "15n7schzmwq4z0yiw0l1js45mml5wq3syb5vc7j9hs88j1jdcp6q")))) + (build-system qt-build-system) + (native-inputs + (list extra-cmake-modules qttools)) + (inputs + (list + qtdeclarative + qtsvg + karchive + kconfig + kcolorscheme + kcoreaddons + kguiaddons + kirigami)) + (arguments + (list #:qtbase qtbase + #:phases #~(modify-phases %standard-phases + (add-before 'check 'check-setup + (lambda _ + (setenv "HOME" (getcwd))))))) + (home-page "https://community.kde.org/Frameworks") + (synopsis "Components for handling SVGs") + (description "A library for rendering SVG-based themes with stylesheet +re-coloring and on-disk caching.") + (license license:lgpl2.1+))) + (define-public ksyntaxhighlighting (package (name "ksyntaxhighlighting") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -1096,27 +1471,25 @@ pixel units.") "syntax-highlighting-" version ".tar.xz")) (sha256 (base32 - "1skblg2m0sar63qrgkjsg0w9scixggm5qj7lp4gzjn4hwq6m3n63")))) + "117r5nsggqnlkd8mg9l2aa00q2ns891xadxl6vxgbgk9r4shlc1q")))) (build-system cmake-build-system) (native-inputs - (list extra-cmake-modules perl qttools-5 - ;; Optional, for compile-time validation of syntax definition files: - qtxmlpatterns)) + (list extra-cmake-modules perl qttools)) (inputs - (list qtbase-5)) + (list qtbase qtdeclarative)) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'patch-source-shebangs 'unpatch-source-shebang - (lambda _ - ;; revert the patch-shebang phase on scripts which are - ;; in fact test data - (substitute* '("autotests/input/highlight.sh" - "autotests/folding/highlight.sh.fold") - (((which "sh")) " /bin/sh")) ;; space in front! - (substitute* '("autotests/input/highlight.pl" - "autotests/folding/highlight.pl.fold") - (((which "perl")) "/usr/bin/perl"))))))) + (list #:phases + #~(modify-phases %standard-phases + (add-after 'patch-source-shebangs 'unpatch-source-shebang + (lambda _ + ;; revert the patch-shebang phase on scripts which are + ;; in fact test data + (substitute* '("autotests/input/highlight.sh" + "autotests/folding/highlight.sh.fold") + (((which "sh")) " /bin/sh")) ;; space in front! + (substitute* '("autotests/input/highlight.pl" + "autotests/folding/highlight.pl.fold") + (((which "perl")) "/usr/bin/perl"))))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Syntax highlighting engine for Kate syntax definitions") (description "This is a stand-alone implementation of the Kate syntax @@ -1127,17 +1500,38 @@ integration with a custom editor as well as a ready-to-use (properties `((upstream-name . "syntax-highlighting"))) (license license:lgpl2.1+))) +(define-public ksyntaxhighlighting-5 + (package + (inherit ksyntaxhighlighting) + (name "ksyntaxhighlighting") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + "syntax-highlighting-" version ".tar.xz")) + (sha256 + (base32 + "19zs3n6cn83rjs0bpyrn6f5r75qcflavf8rb1c2wxj8dpp7cm33g")))) + (native-inputs + (list extra-cmake-modules perl qttools-5 + ;; Optional, for compile-time validation of syntax definition files: + qtxmlpatterns)) + (inputs + (list qtbase-5)))) + (define-public plasma-wayland-protocols (package (name "plasma-wayland-protocols") - (version "1.12.0") + (version "1.13.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/" name "/" name "-" version ".tar.xz")) (sha256 (base32 - "17jg1nvpq0718wv3nc54kd7pcn4riz2p2pcvay1kr4fbg79bz0ql")))) + "0znm2nhpmfq2vakyapmq454mmgqr5frc91k2d2nfdxjz5wspwiyx")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules)) (arguments '(#:tests? #f)) ;no tests @@ -1154,7 +1548,43 @@ protocols used in KDE Plasma.") (define-public kwayland (package (name "kwayland") - (version "5.114.0") + (version "6.1.2") + (source (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/plasma/" + version "/kwayland" "-" + version ".tar.xz")) + (sha256 + (base32 + "15dmbcqhajqc100k95y6nh0w2br8xwql4mlq8grh4r6cdgn378n6")))) + (build-system qt-build-system) + (native-inputs + (list extra-cmake-modules pkg-config + ;; for wayland-scanner + wayland)) + (inputs + (list libxkbcommon + plasma-wayland-protocols + qtwayland + wayland + wayland-protocols)) + (arguments + (list #:qtbase qtbase)) + (home-page "https://invent.kde.org/plasma/kwayland") + (synopsis "Qt-style API to interact with the wayland client and server") + (description "As the names suggest they implement a Client respectively a +Server API for the Wayland protocol. The API is Qt-styled removing the needs to +interact with a for a Qt developer uncomfortable low-level C-API. For example +the callback mechanism from the Wayland API is replaced by signals, data types +are adjusted to be what a Qt developer expects - two arguments of int are +represented by a QPoint or a QSize.") + (license license:lgpl2.1+))) + +(define-public kwayland-5 + (package + (inherit kwayland) + (name "kwayland") + (version "5.116.0") (source (origin (method url-fetch) (uri (string-append @@ -1163,14 +1593,12 @@ protocols used in KDE Plasma.") name "-" version ".tar.xz")) (sha256 (base32 - "1lzmlbv5vl656cigjj07hbc0gj6g1i2xqanvnhxj360109kzilf1")))) - (build-system qt-build-system) + "1n5fq0gppx6rzgzkkskd077jygzj7cindb7zwr35yvbg5l69gdc8")))) (native-inputs (list extra-cmake-modules pkg-config)) (inputs (list libxkbcommon plasma-wayland-protocols - qtbase-5 qtwayland-5 wayland wayland-protocols)) @@ -1197,21 +1625,12 @@ protocols used in KDE Plasma.") ;; The 'kwayland-testXdgForeign' may fail on ;; powerpc64le with a 'Subprocess aborted' error. "kwayland-testXdgForeign") "|") - ")")))))))) - (home-page "https://community.kde.org/Frameworks") - (synopsis "Qt-style API to interact with the wayland client and server") - (description "As the names suggest they implement a Client respectively a -Server API for the Wayland protocol. The API is Qt-styled removing the needs to -interact with a for a Qt developer uncomfortable low-level C-API. For example -the callback mechanism from the Wayland API is replaced by signals, data types -are adjusted to be what a Qt developer expects - two arguments of int are -represented by a QPoint or a QSize.") - (license license:lgpl2.1+))) + ")")))))))))) (define-public kwidgetsaddons (package (name "kwidgetsaddons") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -1220,23 +1639,25 @@ represented by a QPoint or a QSize.") name "-" version ".tar.xz")) (sha256 (base32 - "1cc8lsk9v0cp2wiy1q26mlkf8np0yj01sq8a7w13ga5s6hv4sh2n")))) + "0k44s7j80qapnwsjr1y7igpzxddy065gw3xm7i1av9m0p46rygqf")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules qttools-5 xorg-server-for-tests)) - (inputs - (list qtbase-5)) + (list extra-cmake-modules qttools)) (arguments (list + #:qtbase qtbase #:phases #~(modify-phases %standard-phases (replace 'check - (lambda* (#:key tests? #:allow-other-keys) + (lambda* (#:key tests? parallel-tests? #:allow-other-keys) (when tests? - (setenv "XDG_CACHE_HOME" "/tmp/xdg-cache") + ;; hideLaterShouldHideAfterDelay function time: 300000ms, total time: 300009ms (invoke "ctest" "-E" - "(ksqueezedtextlabelautotest|\ -kwidgetsaddons-kcolumnresizertest)"))))))) + "(ktooltipwidgettest)" + "-j" + (if parallel-tests? + (number->string (parallel-job-count)) + "1")))))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Large set of desktop widgets") (description "Provided are action classes that can be added to toolbars or @@ -1245,10 +1666,38 @@ dates and times, or MIME types, as well as platform-aware dialogs for configuration pages, message boxes, and password requests.") (license (list license:gpl2+ license:lgpl2.1+)))) +(define-public kwidgetsaddons-5 + (package + (inherit kwidgetsaddons) + (name "kwidgetsaddons") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0rcm27wra9s7kzlk67y0f57l0rnh5vb9c2w39h6yjq37y5af1qd8")))) + (native-inputs + (list extra-cmake-modules qttools-5 xorg-server-for-tests)) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "XDG_CACHE_HOME" "/tmp/xdg-cache") + (invoke "ctest" "-E" + "(ksqueezedtextlabelautotest|\ +kwidgetsaddons-kcolumnresizertest)"))))))))) + (define-public kwindowsystem (package (name "kwindowsystem") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -1257,19 +1706,24 @@ configuration pages, message boxes, and password requests.") name "-" version ".tar.xz")) (sha256 (base32 - "03xbsf1pmswd2kpn3pdszp4vndclsh7j02fp22npxaxllmfr4va9")))) + "1fdax3c2q3fm56pvr99z0rwf1nwz7jmksblj9d42gg1l55ckrqs0")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules pkg-config + wayland; for wayland-scanner dbus ; for the tests - openbox ; for the tests - qttools-5 + openbox ; for the test + qttools xorg-server-for-tests)) ; for the tests (inputs - (list libxrender - qtbase-5 - qtx11extras + (list qtbase + qtdeclarative + qtwayland + wayland-protocols + plasma-wayland-protocols + libxkbcommon + wayland xcb-util-keysyms xcb-util-wm)) (arguments @@ -1280,7 +1734,7 @@ configuration pages, message boxes, and password requests.") (lambda* (#:key tests? #:allow-other-keys) ;; The test suite requires a running window anager (when tests? - (setenv "XDG_RUNTIME_DIR" "/tmp") + (setenv "XDG_RUNTIME_DIR" (getcwd)) (system "Xvfb :1 -ac -screen 0 640x480x24 &") (setenv "DISPLAY" ":1") (sleep 5) ;; Give Xvfb a few moments to get on it's feet @@ -1302,10 +1756,38 @@ lower level classes for interaction with the X Windowing System.") ;; the lgpl2.1. Some source files are under non-copyleft licenses. (license license:lgpl2.1+))) +(define-public kwindowsystem-5 + (package + (inherit kwindowsystem) + (name "kwindowsystem") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0d2kxcpcvpzv07ldd1kb5gjclhmn6gcn5ms0bd8f5g9gflrpdjby")))) + (native-inputs + (list extra-cmake-modules + pkg-config + dbus ; for the tests + openbox ; for the tests + qttools-5 + xorg-server-for-tests)) ; for the tests + (inputs + (list libxrender + qtbase-5 + qtx11extras + xcb-util-keysyms + xcb-util-wm)))) + (define-public modemmanager-qt (package (name "modemmanager-qt") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -1314,7 +1796,7 @@ lower level classes for interaction with the X Windowing System.") name "-" version ".tar.xz")) (sha256 (base32 - "16jqhmcpsffl9a7c0bb4hwjy3bw5rakdsnc5n6y8djc6237jl9pi")))) + "1ky77v27nbil5vcig07yyk3jahv673qr7pn41dsb7f588sbh5www")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules dbus pkg-config)) @@ -1322,7 +1804,7 @@ lower level classes for interaction with the X Windowing System.") ;; Headers contain #include <ModemManager/ModemManager.h> (list modem-manager)) (inputs - (list qtbase-5)) + (list qtbase)) (arguments (list #:phases #~(modify-phases %standard-phases (replace 'check @@ -1341,7 +1823,7 @@ messages.") (define-public networkmanager-qt (package (name "networkmanager-qt") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -1350,16 +1832,16 @@ messages.") name "-" version ".tar.xz")) (sha256 (base32 - "10anjsnrzawrfjlznjvvl2sbxrajl2ddnq2kgl314b5dk7z3yk4n")))) + "1q1r3s136bpg2gnrwhakww9yzd42ccymvisrpqv3l0wgywxnma8c")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules dbus pkg-config)) + (inputs (list qtbase)) (propagated-inputs ;; Headers contain #include <NetworkManager.h> and ;; #include <libnm/NetworkManager.h> - (list network-manager)) - (inputs - (list qtbase-5)) + (list network-manager + qtdeclarative)) (arguments (list #:phases #~(modify-phases %standard-phases (replace 'check @@ -1375,34 +1857,57 @@ your network devices and also provides a library for parsing connection settings which are used in DBus communication.") (license license:lgpl2.1+))) -(define-public oxygen-icons +(define-public networkmanager-qt5 (package - (name "oxygen-icons") - (version "5.112.0") + (inherit networkmanager-qt) + (name "networkmanager-qt5") + (version "5.116.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/frameworks/" - (version-major+minor version) "/" - name "5" "-" version ".tar.xz")) + (version-major+minor version) + "/networkmanager-qt-" version ".tar.xz")) (sha256 (base32 - "0yw2mixy5p8pw9866rfr0wcjhvilznakd0h6934svv0dk3lv054a")))) - (build-system cmake-build-system) + "0s8vc3qqx76f70vql77hb3nxkn6b3hvzdm6bgcpnnxqhw6j80khb")))) (native-inputs - (list extra-cmake-modules fdupes)) + (list extra-cmake-modules dbus pkg-config)) + (propagated-inputs + ;; Headers contain #include <NetworkManager.h> and + ;; #include <libnm/NetworkManager.h> + (list network-manager)) (inputs (list qtbase-5)) + (properties `((upstream-name . "networkmanager-qt"))))) + +(define-public oxygen-icons + (package + (name "oxygen-icons") + (version "6.0.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/oxygen-icons/" + "/oxygen-icons" "-" version ".tar.xz")) + (sha256 + (base32 + "0x2piq03gj72p5qlhi8zdx3r58va088ysp7lg295vhfwfll1iv18")))) + (build-system cmake-build-system) + (native-inputs + (list extra-cmake-modules + ;; for test + fdupes)) + (inputs (list qtbase)) (home-page "https://community.kde.org/Frameworks") (synopsis "Oxygen provides the standard icon theme for the KDE desktop") (description "Oxygen icon theme for the KDE desktop") - (license license:lgpl3+) - (properties '((upstream-name . "oxygen-icons5"))))) + (license license:lgpl3+))) (define-public prison (package (name "prison") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) @@ -1410,12 +1915,12 @@ which are used in DBus communication.") (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 - (base32 "1wbr1lryxmrx65ilq1bhqsdhhikrih977nhpb02fq0cqnvv7v9i7")))) + (base32 "0imwniw2lpsjipzyx9vmwwdy370sg5zynh9gk9g1w1c7axr0g63n")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules)) (inputs - (list libdmtx qrencode qtbase-5)) ;; TODO: rethink: nix propagates this + (list libdmtx zxing-cpp qrencode qtbase qtdeclarative qtmultimedia)) (home-page "https://api.kde.org/frameworks/prison/html/index.html") (synopsis "Barcode generation abstraction layer") (description "Prison is a Qt-based barcode abstraction layer/library and @@ -1425,19 +1930,20 @@ provides uniform access to generation of barcodes with data.") (define-public pulseaudio-qt (package (name "pulseaudio-qt") - (version "1.4.0") + (version "1.5.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/pulseaudio-qt" "/pulseaudio-qt-" version ".tar.xz")) (sha256 (base32 - "0rfh1qawf2bxh26p5xr03z2zizpnfw8k9ycwhmmqac11rx765jnq")))) + "0845d910jyd6w02yc157m4myfwzbmj1l0y6mj3yx0wq0f34533yd")))) (build-system cmake-build-system) + (arguments (list #:configure-flags #~(list "-DBUILD_WITH_QT6=ON"))) (native-inputs (list extra-cmake-modules pkg-config)) (inputs - (list glib pulseaudio qtdeclarative-5 qtbase-5)) + (list glib pulseaudio qtdeclarative qtbase)) (home-page "https://invent.kde.org/libraries/pulseaudio-qt/") (synopsis "Qt bindings for PulseAudio") (description @@ -1452,7 +1958,7 @@ libpulse.") (define-public qqc2-desktop-style (package (name "qqc2-desktop-style") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -1461,20 +1967,26 @@ libpulse.") name "-" version ".tar.xz")) (sha256 (base32 - "1y5g91vybjvhwmzpfwrc70q5j7jxf5b972f9fh2vzb930jir6c8g")))) - (build-system cmake-build-system) + "1c5wy4a8x2lslc3dkqpn7k479jfpam63c93sqgyd4iingyxnjzly")))) + (build-system qt-build-system) + (arguments + (list + #:qtbase qtbase + #:phases #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "dbus-launch" "ctest" + "--rerun-failed" "--output-on-failure"))))))) (native-inputs - (list extra-cmake-modules pkg-config)) + (list extra-cmake-modules dbus pkg-config qttools)) (inputs (list kauth - kconfigwidgets ; optional + kconfig ; optional kcoreaddons kiconthemes ; optional kirigami - qtbase-5 - qtdeclarative-5 - qtquickcontrols2-5 - qtx11extras ; optional + qtdeclarative sonnet)) ; optional (home-page "https://community.kde.org/Frameworks") (synopsis "QtQuickControls2 style that integrates with the desktop") @@ -1487,7 +1999,7 @@ feel.") (define-public solid (package (name "solid") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -1496,8 +2008,37 @@ feel.") name "-" version ".tar.xz")) (sha256 (base32 - "1slxlj5jhp8g745l328932934633nl81sq3n8fd73h655hymsk4s")))) + "1nckgnr2834ppjjm3nq5xcasw7f3rvr95g8d37yh3vmwk6arj8dq")))) (build-system cmake-build-system) + (native-inputs + (list bison dbus extra-cmake-modules flex qttools)) + ;; TODO: Add runtime-only dependency MediaPlayerInfo + (inputs + (list `(,util-linux "lib") ;; Optional, for libmount + libxkbcommon + vulkan-headers + qtbase qtdeclarative eudev)) + (home-page "https://community.kde.org/Frameworks") + (synopsis "Desktop hardware abstraction") + (description "Solid is a device integration framework. It provides a way of +querying and interacting with hardware independently of the underlying operating +system.") + (license license:lgpl2.1+))) + +(define-public solid-5 + (package + (inherit solid) + (name "solid") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "04359x7rhhl68xcrspxywxywb900dvlkna5fb442npwiqaxdxhy6")))) (arguments (list #:phases #~(modify-phases %standard-phases (replace 'check @@ -1508,19 +2049,12 @@ feel.") (native-inputs (list bison dbus extra-cmake-modules flex qttools-5)) (inputs - (list qtbase-5 qtdeclarative-5 eudev)) - ;; TODO: Add runtime-only dependency MediaPlayerInfo - (home-page "https://community.kde.org/Frameworks") - (synopsis "Desktop hardware abstraction") - (description "Solid is a device integration framework. It provides a way of -querying and interacting with hardware independently of the underlying operating -system.") - (license license:lgpl2.1+))) + (list qtbase-5 qtdeclarative-5 eudev)))) (define-public sonnet (package (name "sonnet") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -1529,16 +2063,15 @@ system.") name "-" version ".tar.xz")) (sha256 (base32 - "0zxi96i3gfpx759qc1nyz7jqlswg5ivgr1w9gbbsm1x5fi9ikadx")))) + "0zjcjy2b697wizgrr210g24cvkli6yi2ry05kzfc6xxarq0dsi3b")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs - (list extra-cmake-modules pkg-config qttools-5)) + (list extra-cmake-modules pkg-config qttools)) (inputs - (list aspell - hunspell + (list aspell hunspell ;; TODO: hspell (for Hebrew), Voikko (for Finish) - qtdeclarative-5 - qtbase-5)) + qtdeclarative)) (home-page "https://community.kde.org/Frameworks") (synopsis "Multi-language spell checker") (description "Sonnet is a plugin-based spell checking library for Qt-based @@ -1546,10 +2079,32 @@ applications. It supports several different plugins, including HSpell, Enchant, ASpell and HUNSPELL.") (license license:lgpl2.1+))) +(define-public sonnet-5 + (package + (inherit sonnet) + (name "sonnet") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0jja3wxk4h62ik5pkf0i5v9012d0qjaljyaab2a9g0j2wy070hcq")))) + (arguments '()) + (native-inputs + (list extra-cmake-modules pkg-config qttools-5)) + (inputs + (list aspell + hunspell + qtdeclarative-5)))) + (define-public threadweaver (package (name "threadweaver") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -1558,40 +2113,70 @@ ASpell and HUNSPELL.") name "-" version ".tar.xz")) (sha256 (base32 - "1y07g58w6z3i11y3djg3aaxanhp9hzaciq61l4dn1gqwghn09xgh")))) + "04yrywhjhlyf1ha3w6rmaszyb28j91lc9j55frxrdmhqk67iy841")))) (build-system cmake-build-system) - (native-inputs - (list extra-cmake-modules)) - (inputs - (list qtbase-5)) + (native-inputs (list extra-cmake-modules)) + (inputs (list qtbase)) (home-page "https://community.kde.org/Frameworks") (synopsis "Helper for multithreaded programming") (description "ThreadWeaver is a helper for multithreaded programming. It uses a job-based interface to queue tasks and execute them in an efficient way.") (license license:lgpl2.1+))) +(define-public threadweaver-5 + (package + (inherit threadweaver) + (name "threadweaver") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1q7ax3dhsayz35j0l9pdmarkwfyyy1dsy2crdf5xz8pr5mjxq8wp")))) + (native-inputs + (list extra-cmake-modules)) + (inputs + (list qtbase-5)))) + (define-public libkdcraw (package (name "libkdcraw") - (version "23.08.4") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/" name "-" version ".tar.xz")) (sha256 - (base32 "1mm3gsp7lfqxb9irk59hrzaxdqjv28iwaa1xmpazw4q62nmlj7mi")))) + (base32 "0a4aifi3jwkizdn2qsa441f28j9ykymw4bn922d5pz6c9riw3ssr")))) (build-system cmake-build-system) (native-inputs (list pkg-config extra-cmake-modules)) (inputs - (list libraw qtbase-5)) + (list libraw qtbase)) + (arguments (list #:configure-flags + #~(list #$(string-append + "-DQT_MAJOR_VERSION=" + (version-major + (package-version + (this-package-input "qtbase"))))))) (home-page "https://invent.kde.org/graphics/libkdcraw") (synopsis "C++ interface used to decode RAW picture files") (description "Libkdcraw is a C++ interface around LibRaw library used to decode RAW picture files.") (license (list license:gpl2+ license:bsd-3)))) +(define-public libkdcraw-qt5 + (package + (inherit libkdcraw) + (name "libkdcraw-qt5") + (inputs (modify-inputs (package-inputs libkdcraw) + (replace "qtbase" qtbase-5))))) + ;; Tier 2 ;; ;; Tier 2 frameworks additionally depend on tier 1 frameworks, but still have @@ -1600,7 +2185,7 @@ decode RAW picture files.") (define-public kactivities (package (name "kactivities") - (version "5.114.0") + (version "5.116.0") (source (origin (method url-fetch) (uri (string-append @@ -1609,29 +2194,28 @@ decode RAW picture files.") name "-" version ".tar.xz")) (sha256 (base32 - "10pyynqz8c22la9aqms080iqlisj3irbi1kwnn3s0vg5dsjxr1p3")))) + "0zbjs4sysfaf6zsdnfmkbpxsc2bg5ncnhkzfn1dyhrsqk68lwz3s")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) (inputs (list boost - kauth - kbookmarks - kcodecs - kcompletion - kconfig - kconfigwidgets - kcoreaddons - kio - kitemviews - kjobwidgets - kservice - kwidgetsaddons - kwindowsystem - kxmlgui - qtbase-5 + kauth-5 + kbookmarks-5 + kcodecs-5 + kcompletion-5 + kconfig-5 + kconfigwidgets-5 + kcoreaddons-5 + kio-5 + kitemviews-5 + kjobwidgets-5 + kservice-5 + kwidgetsaddons-5 + kwindowsystem-5 + kxmlgui-5 qtdeclarative-5 - solid)) + solid-5)) (home-page "https://community.kde.org/Frameworks") (synopsis "Core components for the KDE Activity concept") (description "KActivities provides the infrastructure needed to manage a @@ -1645,7 +2229,7 @@ with other frameworks.") (define-public kauth (package (name "kauth") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -1654,12 +2238,13 @@ with other frameworks.") name "-" version ".tar.xz")) (sha256 (base32 - "1rkf9mc9718wn8pzd3d3wcg3lsn0vkr9a2cqnz86rbg3cf2qdbir")))) + "1d9kmxbb3rx4nx1yq0crywirmnnp8qvhs2pdng7s49pqdy0kdkzb")))) (build-system cmake-build-system) (native-inputs - (list dbus extra-cmake-modules qttools-5)) + (list dbus extra-cmake-modules qttools)) + (propagated-inputs (list kcoreaddons)) (inputs - (list kcoreaddons polkit-qt qtbase-5)) + (list kwindowsystem polkit-qt6 qtbase)) (arguments (list #:phases @@ -1668,7 +2253,9 @@ with other frameworks.") (lambda _ ;; Make packages using kauth put their policy files and helpers ;; into their own prefix. - (substitute* "KF5AuthConfig.cmake.in" + (substitute* #$(string-append "KF" (version-major + (package-version this-package)) + "AuthConfig.cmake.in") (("@KAUTH_POLICY_FILES_INSTALL_DIR@") "${KDE_INSTALL_DATADIR}/polkit-1/actions") (("@KAUTH_HELPER_INSTALL_DIR@") @@ -1687,10 +2274,31 @@ actions that need to be performed as a privileged user to small set of helper utilities.") (license license:lgpl2.1+))) +(define-public kauth-5 + (package + (inherit kauth) + (name "kauth") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1x0zd6lqv855jkihxpzhxs732qiva31kzjah9hf2j6xaq0dfxqdc")))) + (build-system cmake-build-system) + (native-inputs + (list dbus extra-cmake-modules qttools-5)) + (inputs + (list kcoreaddons-5 polkit-qt qtbase-5)) + (propagated-inputs '()))) + (define-public kcompletion (package (name "kcompletion") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -1699,12 +2307,13 @@ utilities.") name "-" version ".tar.xz")) (sha256 (base32 - "0qvdxqlh1dklkbmqfjg5gc3dkdicgzn6q5lgvyf8cv46dinj6mwc")))) + "0bkixs49w56d6s2yi5nkk6q2rg86wc81phrqa0508p98pp37l0iz")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules qttools-5)) + (list extra-cmake-modules qttools)) (inputs - (list kconfig kwidgetsaddons qtbase-5)) + (list kcodecs kconfig kwidgetsaddons)) + (arguments (list #:qtbase qtbase)) (home-page "https://community.kde.org/Frameworks") (synopsis "Powerful autocompletion framework and widgets") (description "This framework helps implement autocompletion in Qt-based @@ -1712,10 +2321,30 @@ applications. It provides a set of completion-ready widgets, or can be integrated it into your application's other widgets.") (license license:lgpl2.1+))) +(define-public kcompletion-5 + (package + (inherit kcompletion) + (name "kcompletion") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1sh9gpbi65mbs8bszrxh7a9ifgcr7z5jrhsac3670905a6mdmfjj")))) + (native-inputs + (list extra-cmake-modules qttools-5)) + (inputs + (list kconfig-5 kwidgetsaddons-5)) + (arguments '()))) + (define-public kcontacts (package (name "kcontacts") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -1726,24 +2355,22 @@ integrated it into your application's other widgets.") (search-patches "kcontacts-incorrect-country-name.patch")) (sha256 (base32 - "0lyqvbs216p5zpssaf4pyccph7nbwkbvhpmhbi32y2rm23cmxlwf")))) - (build-system cmake-build-system) - (native-inputs - (list extra-cmake-modules xorg-server-for-tests)) ; for the tests - (inputs - (list qtbase-5)) + "01xi60ykp7lhmwr7890byij893pfxn35qwbz4bmzmiydjwbmp6r2")))) + (build-system qt-build-system) + (native-inputs (list extra-cmake-modules + ;; for test + iso-codes)) + (inputs (list qtdeclarative)) (propagated-inputs - (list ;; As required by KF5ContactsConfig.cmake. - iso-codes kcodecs kconfig kcoreaddons qtdeclarative-5 ki18n)) + (list ;; As required by KF6ContactsConfig.cmake. + kcodecs kconfig kcoreaddons ki18n)) (arguments (list + #:qtbase qtbase #:phases #~(modify-phases %standard-phases (add-before 'check 'check-setup - (lambda _ - (setenv "HOME" (getcwd)) - (system "Xvfb +extension GLX :1 -screen 0 640x480x24 &") - (setenv "DISPLAY" ":1")))))) + (lambda _ (setenv "HOME" (getcwd))))))) (home-page "https://community.kde.org/Frameworks") (synopsis "API for contacts/address book data following the vCard standard") (description "This library provides a vCard data model, vCard @@ -1755,7 +2382,7 @@ localized country name to ISO 3166-1 alpha 2 code mapping and vice verca. (define-public kcrash (package (name "kcrash") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -1764,22 +2391,41 @@ localized country name to ISO 3166-1 alpha 2 code mapping and vice verca. name "-" version ".tar.xz")) (sha256 (base32 - "1avi4yd3kpjqxrvci1nicxbh9mjafj1w2vgfmqanq66b76s4kxj1")))) + "0hcgljz5wm9v4qphc4cmn81gdrs8lcb4x978xz82gnmqx47pmik5")))) (build-system qt-build-system) - (native-inputs - (list extra-cmake-modules)) - (inputs - (list kcoreaddons kwindowsystem qtbase-5 qtx11extras)) + (native-inputs (list extra-cmake-modules)) + (inputs (list kcoreaddons kwindowsystem)) + (arguments (list #:qtbase qtbase)) (home-page "https://community.kde.org/Frameworks") (synopsis "Graceful handling of application crashes") (description "KCrash provides support for intercepting and handling application crashes.") (license license:lgpl2.1+))) +(define-public kcrash-5 + (package + (inherit kcrash) + (name "kcrash") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0rg8g50y44gq3hjl5fc36siyyq3czd2zrf4c70fspk33svwldlw1")))) + (native-inputs + (list extra-cmake-modules)) + (inputs + (list kcoreaddons-5 kwindowsystem-5 qtx11extras)) + (arguments '()))) + (define-public kdoctools (package (name "kdoctools") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -1788,19 +2434,68 @@ application crashes.") name "-" version ".tar.xz")) (sha256 (base32 - "15s58r2zvdckw30x9q9ir8h1i8q2ncfgjn9h4jnmylwm79z3z27v")))) + "0jl5qxjscjdpf0jpl35ymdqhks3ynk8jxlwv6xdqml6vp4aysl2b")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules)) (inputs (list docbook-xml-4.5 docbook-xsl + gettext-minimal karchive ki18n libxml2 libxslt perl perl-uri + qtbase)) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'cmake-find-docbook + (lambda* (#:key inputs #:allow-other-keys) + (substitute* (find-files "cmake" "\\.cmake$") + (("CMAKE_SYSTEM_PREFIX_PATH") "CMAKE_PREFIX_PATH")) + (substitute* "cmake/FindDocBookXML4.cmake" + (("^.*xml/docbook/schema/dtd.*$") + "xml/dtd/docbook\n")) + (substitute* "cmake/FindDocBookXSL.cmake" + (("^.*xml/docbook/stylesheet.*$") + (string-append "xml/xsl/docbook-xsl-" + #$(package-version (this-package-input "docbook-xsl")) + "\n")))))))) + (home-page "https://community.kde.org/Frameworks") + (synopsis "Create documentation from DocBook") + (description "Provides tools to generate documentation in various format +from DocBook files.") + (license license:lgpl2.1+))) + +(define-public kdoctools-5 + (package + (inherit kdoctools) + (name "kdoctools") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1cvb39ggc79fpfa84rshm6vl10h0avn2rf6qxaxb41r9887ad81n")))) + (native-inputs + (list extra-cmake-modules)) + (inputs + (list docbook-xml-4.5 + docbook-xsl + karchive-5 + ki18n-5 + libxml2 + libxslt + perl + perl-uri qtbase-5)) (arguments (list @@ -1826,17 +2521,12 @@ application crashes.") (let ((xsl (string-append (assoc-ref outputs "out") "/share/kf5/kdoctools/customization/xsl/"))) (symlink (string-append xsl "pt_br.xml") - (string-append xsl "pt-BR.xml")))))))) - (home-page "https://community.kde.org/Frameworks") - (synopsis "Create documentation from DocBook") - (description "Provides tools to generate documentation in various format -from DocBook files.") - (license license:lgpl2.1+))) + (string-append xsl "pt-BR.xml")))))))))) (define-public kfilemetadata (package (name "kfilemetadata") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -1845,7 +2535,7 @@ from DocBook files.") name "-" version ".tar.xz")) (sha256 (base32 - "15va29chlsrxii02w1ax718hp1b14ym59lcfyzh7w30zlf681560")))) + "1230gl5jf4wizvxhfl0l4393vzgfzj0im139kjlss0qshrwf725x")))) (build-system cmake-build-system) (arguments (list @@ -1854,28 +2544,26 @@ from DocBook files.") (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? - ;; FIXME: Test can't find audio/x-speex mimeinfo - ;; (but it can find audio/x-speex+ogg). - (invoke "ctest" "-E" - "(usermetadatawritertest|embeddedimagedatatest|\ -taglibextractortest)"))))))) + (invoke "ctest" "-E" "(exiv2extractortest|usermetadatawritertest)"))))))) (native-inputs (list extra-cmake-modules pkg-config)) (inputs (list attr ebook-tools + kcodecs + libplasma karchive kconfig kcoreaddons kdegraphics-mobipocket ki18n - qtmultimedia-5 - qtbase-5 + qtmultimedia + qtbase ;; Required run-time packages catdoc ;; Optional run-time packages exiv2 ffmpeg - poppler-qt5 + poppler-qt6 taglib)) (home-page "https://community.kde.org/Frameworks") (synopsis "Extract metadata from different fileformats") @@ -1885,6 +2573,47 @@ used by file indexers to retrieve the metadata. This library can also be used by applications to write metadata.") (license (list license:lgpl2.0 license:lgpl2.1 license:lgpl3)))) +(define-public kfilemetadata-5 + (package + (inherit kfilemetadata) + (name "kfilemetadata") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "13yfcy02rmhrhf8lxv7smk1n9rg1ywsh60hwzm94b8hq9a62qp0r")))) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "ctest" "-E" + "(usermetadatawritertest|taglibextractortest)"))))))) + (native-inputs (list extra-cmake-modules pkg-config)) + (inputs + (list attr + ebook-tools + karchive-5 + kconfig-5 + kcoreaddons-5 + ki18n-5 + qtmultimedia-5 + qtbase-5 + ;; Required run-time packages + catdoc + ;; Optional run-time packages + exiv2 + ffmpeg + poppler-qt5 + taglib)))) + (define-public kimageannotator (package (name "kimageannotator") @@ -1901,8 +2630,10 @@ by applications to write metadata.") "1f1y4r5rb971v2g34fgjbr14g0mdms5h66yl5k0p1zf50kr2wnic")))) (build-system qt-build-system) (arguments - (list #:configure-flags #~'("-DBUILD_SHARED_LIBS=ON" - "-DBUILD_TESTS=ON") + (list #:qtbase qtbase + #:configure-flags #~(list "-DBUILD_SHARED_LIBS=ON" + "-DBUILD_TESTS=ON" + "-DBUILD_WITH_QT6=ON") #:phases #~(modify-phases %standard-phases (replace 'check @@ -1913,9 +2644,9 @@ by applications to write metadata.") (setenv "DISPLAY" ":1") (invoke "ctest" "--test-dir" "tests")))))) (native-inputs - (list qttools-5 xorg-server-for-tests)) + (list qttools xorg-server-for-tests)) (inputs - (list googletest qtsvg-5 kcolorpicker)) + (list googletest qtsvg kcolorpicker)) (home-page "https://github.com/ksnip/kImageAnnotator") (synopsis "Image annotating library") (description "This library provides tools to annotate images.") @@ -1924,7 +2655,7 @@ by applications to write metadata.") (define-public kimageformats (package (name "kimageformats") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -1933,14 +2664,22 @@ by applications to write metadata.") name "-" version ".tar.xz")) (sha256 (base32 - "1nfzpgnrbwncx9zp9cwa169jlfv7i85p00a07d4jc5hrdyvvkn0w")))) + "040j1jr7v4bc0zh4lf7bn9sj4a7g3c8icljagjpm7v9mpmqhgm0f")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules pkg-config)) (inputs (list karchive ; for Krita and OpenRaster images - openexr-2 ; for OpenEXR high dynamic-range images - qtbase-5)) + openexr ; for OpenEXR high dynamic-range images + qtbase + libjxl + libraw + libavif + ;; see https://bugs.kde.org/show_bug.cgi?id=468288, + ;; kimageformats-read-psd test need QTiffPlugin + qtimageformats + ;; FIXME: make openexr propagate two package + imath zlib)) (arguments (list #:phases @@ -1948,25 +2687,7 @@ by applications to write metadata.") (add-before 'check 'check-setup (lambda _ ;; make Qt render "offscreen", required for tests - (setenv "QT_QPA_PLATFORM" "offscreen") - (setenv "QT_PLUGIN_PATH" - (string-append (getcwd) "/bin:" - (getenv "QT_PLUGIN_PATH"))))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (setenv "HOME" - (getcwd)) - ;; FIXME: I guess kde's qt no this fail. - ;; see https://invent.kde.org/frameworks/kimageformats/-/jobs/1046283 - (invoke "ctest" "-E" "kimageformats-read-psd"))))) - ;; FIXME: The header files of ilmbase (propagated by openexr) are not - ;; found when included by the header files of openexr, and an explicit - ;; flag needs to be set. - #:configure-flags #~(list (string-append "-DCMAKE_CXX_FLAGS=-I" - (assoc-ref %build-inputs - "ilmbase") - "/include/OpenEXR")))) + (setenv "QT_QPA_PLATFORM" "offscreen")))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Plugins to allow QImage to support extra file formats") (description "This framework provides additional image format plugins for @@ -1975,10 +2696,44 @@ but may be a runtime requirement for Qt-based software to support certain image formats.") (license license:lgpl2.1+))) +(define-public kimageformats-5 + (package + (inherit kimageformats) + (name "kimageformats") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "174g32s3m7irzv2h3lk7bmp3yfc7zrmp7lmp02n3m5ppbv6rn4bw")))) + (native-inputs + (list extra-cmake-modules pkg-config)) + (inputs + (list karchive-5 ; for Krita and OpenRaster images + openexr-2 ; for OpenEXR high dynamic-range images + qtbase-5 + qtimageformats-5)) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'check-setup + (lambda _ + ;; make Qt render "offscreen", required for tests + (setenv "QT_QPA_PLATFORM" "offscreen")))) + #:configure-flags #~(list (string-append "-DCMAKE_CXX_FLAGS=-I" + (assoc-ref %build-inputs + "ilmbase") + "/include/OpenEXR")))))) + (define-public kjobwidgets (package (name "kjobwidgets") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -1987,22 +2742,41 @@ formats.") name "-" version ".tar.xz")) (sha256 (base32 - "1ymlqi5cqcs79nj1vff8pqwgvy0dxj5vv7l529w3a3n315hkrny8")))) + "1n08y5kv3n2179hgqiq3y7illjs6n6i3w33r492cgykrji5jvvjz")))) (build-system cmake-build-system) (native-inputs - (list extra-cmake-modules qttools-5)) + (list extra-cmake-modules qttools)) (inputs - (list kcoreaddons kwidgetsaddons qtbase-5 qtx11extras)) + (list libxkbcommon kcoreaddons knotifications kwidgetsaddons qtbase)) (home-page "https://community.kde.org/Frameworks") (synopsis "Widgets for showing progress of asynchronous jobs") (description "KJobWIdgets provides widgets for showing progress of asynchronous jobs.") (license license:lgpl2.1+))) +(define-public kjobwidgets-5 + (package + (inherit kjobwidgets) + (name "kjobwidgets") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "11xy7n2sz340wili21ia92ihfq76irh8c7db8x1qsgqq09ypzhza")))) + (native-inputs + (list extra-cmake-modules qttools-5)) + (inputs + (list kcoreaddons-5 kwidgetsaddons-5 qtbase-5 qtx11extras)))) + (define-public knotifications (package (name "knotifications") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -2011,15 +2785,43 @@ asynchronous jobs.") name "-" version ".tar.xz")) (sha256 (base32 - "0cjd5ml9hyzprjgmrc132cmp7g9hnl0h5swlxw2ifqnxxyfkg72b")))) + "0xvqri0ykx9qb6q2gjpxri71jvghzwy6p332vj8drzlm6wd3rvfc")))) (build-system cmake-build-system) (native-inputs - (list extra-cmake-modules dbus pkg-config qttools-5)) + (list extra-cmake-modules pkg-config qttools)) + (propagated-inputs (list qtdeclarative)) (inputs - (list kcodecs - kconfig + (list kconfig kcoreaddons - kwindowsystem + libcanberra + qtbase)) + (home-page "https://community.kde.org/Frameworks") + (synopsis "Desktop notifications") + (description "KNotification is used to notify the user of an event. It +covers feedback and persistent events.") + (license license:lgpl2.1+))) + +(define-public knotifications-5 + (package + (inherit knotifications) + (name "knotifications") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0jxld7f82psa48r0n9qv1cks6w1vd6krjnyb4mw68vgm38030na8")))) + (native-inputs + (list extra-cmake-modules dbus pkg-config qttools-5)) + (inputs + (list kcodecs-5 + kconfig-5 + kcoreaddons-5 + kwindowsystem-5 libcanberra libdbusmenu-qt phonon @@ -2027,6 +2829,7 @@ asynchronous jobs.") qtbase-5 qtspeech-5 qtx11extras)) + (propagated-inputs '()) (arguments (list #:phases #~(modify-phases %standard-phases (replace 'check @@ -2035,17 +2838,12 @@ asynchronous jobs.") (setenv "HOME" (getcwd)) (setenv "DBUS_FATAL_WARNINGS" "0") - (invoke "dbus-launch" "ctest"))))))) - (home-page "https://community.kde.org/Frameworks") - (synopsis "Desktop notifications") - (description "KNotification is used to notify the user of an event. It -covers feedback and persistent events.") - (license license:lgpl2.1+))) + (invoke "dbus-launch" "ctest"))))))))) (define-public kpackage (package (name "kpackage") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -2054,17 +2852,74 @@ covers feedback and persistent events.") name "-" version ".tar.xz")) (sha256 (base32 - "0v165az3k5lfszxy0kl2464573y0dcq92fyfiklwnkkcjsvba69d")))) + "0k8ba4s5g7i57nlz3y1qs1gaagxjdv4arzna0ymfmhciw04nh7c1")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules)) + (propagated-inputs (list kcoreaddons)) (inputs (list karchive kconfig - kcoreaddons kdoctools ki18n + qtbase)) + (arguments + (list + ;; The `plasma-querytest' test is known to fail when tests are run in parallel: + ;; <https://sources.debian.org/src/kpackage/5.115.0-2/debian/changelog/#L109> + #:parallel-tests? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch + (lambda _ + (substitute* "src/kpackage/package.cpp" + (("bool externalPaths = false;") + "bool externalPaths = true;")) + (substitute* '("src/kpackage/packageloader.cpp") + (("QDirIterator::Subdirectories") + "QDirIterator::Subdirectories | QDirIterator::FollowSymlinks")))) + (add-before 'check 'check-setup + (lambda _ (setenv "HOME" (getcwd)))) + (replace 'check + (lambda* (#:key tests? parallel-tests? #:allow-other-keys) + (setenv "CTEST_OUTPUT_ON_FAILURE" "1") + ;; sometime plasmoidpackagetest will fail. + (invoke "ctest" "--rerun-failed" "--output-on-failure" + "-j" (if parallel-tests? + (number->string (parallel-job-count)) + "1") + "-E" "plasmoidpackagetest")))))) + (home-page "https://community.kde.org/Frameworks") + (synopsis "Installation and loading of additional content as packages") + (description "The Package framework lets the user install and load packages +of non binary content such as scripted extensions or graphic assets, as if they +were traditional plugins.") + (license (list license:gpl2+ license:lgpl2.1+)))) + +(define-public kpackage-5 + (package + (inherit kpackage) + (name "kpackage") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1gpixfkyaflmzk8lkxnknydm4x6w5339yrgs2n9g229bqy2v21ap")))) + (native-inputs + (list extra-cmake-modules)) + (inputs + (list karchive-5 + kconfig-5 + kcoreaddons-5 + kdoctools-5 + ki18n-5 qtbase-5)) + (propagated-inputs '()) (arguments (list #:phases @@ -2102,18 +2957,12 @@ covers feedback and persistent events.") "")))) (add-before 'check 'check-setup (lambda _ - (setenv "HOME" (getcwd))))))) - (home-page "https://community.kde.org/Frameworks") - (synopsis "Installation and loading of additional content as packages") - (description "The Package framework lets the user install and load packages -of non binary content such as scripted extensions or graphic assets, as if they -were traditional plugins.") - (license (list license:gpl2+ license:lgpl2.1+)))) + (setenv "HOME" (getcwd))))))))) (define-public kpty (package (name "kpty") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -2122,21 +2971,20 @@ were traditional plugins.") name "-" version ".tar.xz")) (sha256 (base32 - "0fm7bfp89kvg1a64q8piiyal71p6vjnqcm13zak6r9fbfwcm0gs9")))) + "19m01phaca84n736sdh1d002vbfbhf7lzb8cf1wqrhaak0wrp933")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules)) (inputs - (list kcoreaddons ki18n - ;; TODO: utempter, for managing UTMP entries - qtbase-5)) + ;; TODO: utempter, for managing UTMP entries + (list kcoreaddons ki18n qtbase)) (arguments (list #:tests? #f ; FIXME: 1/1 tests fail. #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch-tests (lambda _ (substitute* "autotests/kptyprocesstest.cpp" - (("/bin/bash") + (("/bin/sh") (which "bash")))))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Interfacing with pseudo terminal devices") @@ -2148,7 +2996,7 @@ and communicating with them using a pty.") (define-public kunitconversion (package (name "kunitconversion") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -2157,13 +3005,13 @@ and communicating with them using a pty.") name "-" version ".tar.xz")) (sha256 (base32 - "1qyqvl8fy105zwma5nrkz9zg5932w2f33daw0azhj322iffrm39n")))) + "16q7jl86bc6y17xd6hyi6b506cpjx21jirlffkmz8ggzs0nz9cvx")))) (build-system cmake-build-system) - (arguments `(#:tests? #f)) ;; Requires network. (native-inputs (list extra-cmake-modules)) (inputs - (list ki18n qtbase-5)) + (list ki18n qtbase)) + (arguments `(#:tests? #f)) ;; Requires network. (home-page "https://community.kde.org/Frameworks") (synopsis "Converting physical units") (description "KUnitConversion provides functions to convert values in @@ -2175,7 +3023,7 @@ gallons).") (define-public syndication (package (name "syndication") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -2184,12 +3032,12 @@ gallons).") name "-" version ".tar.xz")) (sha256 (base32 - "13rjb1zm9yd8vbm9h7avqih5v0rr2srqwglm29l7mcnankqlh4n7")))) + "1m68g7cm1cqkysb1yxnqnq9fcvjjp1kjl1s0j203jpp3kg05gw6d")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules)) (inputs - (list kcodecs qtbase-5)) + (list kcodecs qtbase)) (home-page "https://community.kde.org/Frameworks") (synopsis "RSS/Atom parser library") (description "@code{syndication} supports RSS (0.9/1.0, 0.91..2.0) and @@ -2207,7 +3055,7 @@ between feed formats.") (define-public baloo (package (name "baloo") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -2216,7 +3064,7 @@ between feed formats.") name "-" version ".tar.xz")) (sha256 (base32 - "19sib1y0m5h2gnnpr9rfk810p6pdfm4zzxlm0a44r7910llp8i50")))) + "0r50alvnzkqmyhk9bfp1k1b6w6v3clb80z4bcag4f0wkipjrdbw7")))) (build-system cmake-build-system) (propagated-inputs (list kcoreaddons kfilemetadata)) @@ -2237,18 +3085,21 @@ between feed formats.") kwidgetsaddons kxmlgui lmdb - qtbase-5 - qtdeclarative-5 + qtbase + qtdeclarative solid)) (arguments - (list #:phases #~(modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (setenv "DBUS_FATAL_WARNINGS" "0") - (setenv "HOME" - (getcwd)) - (invoke "dbus-launch" "ctest"))))))) + (list #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "DBUS_FATAL_WARNINGS" "0") + (setenv "HOME" + (getcwd)) + (invoke "dbus-launch" "ctest" "-E" + ;; this require udisks2. + "filewatchtest"))))))) (home-page "https://community.kde.org/Frameworks") (synopsis "File searching and indexing") (description "Baloo provides file searching and indexing. It does so by @@ -2256,25 +3107,57 @@ maintaining an index of the contents of your files.") ;; dual licensed (license (list license:gpl2+ license:lgpl2.1+)))) -(define-public kactivities-stats +(define-public plasma-activities (package - (name "kactivities-stats") - (version "5.114.0") + (name "plasma-activities") + (version "6.1.2") (source (origin (method url-fetch) - (uri (string-append - "mirror://kde/stable/frameworks/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) + (uri (string-append "mirror://kde/stable/plasma/" + version "/plasma-activities-" + version ".tar.xz")) + (sha256 + (base32 + "1nx6363l85f0c4f3l189cjfz4rbap2cq292v2136agdppl4gq0iy")))) + (build-system qt-build-system) + (native-inputs + (list extra-cmake-modules)) + (inputs + (list boost + kconfig + kcoreaddons + kwindowsystem + qtdeclarative + solid)) + (arguments (list #:qtbase qtbase)) + (home-page "https://invent.kde.org/plasma/plasma-activities") + (synopsis "Core components for the KDE Activity System") + (description "KActivities provides the infrastructure needed to manage a +user's activities, allowing them to switch between tasks, and for applications +to update their state to match the user's current activity. This includes a +daemon, a library for interacting with that daemon, and plugins for integration +with other frameworks.") + ;; triple licensed + (license (list license:gpl2+ license:lgpl2.0+ license:lgpl2.1+)))) + +(define-public plasma-activities-stats + (package + (name "plasma-activities-stats") + (version "6.1.2") + (source (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/plasma/" + version "/plasma-activities-stats-" + version ".tar.xz")) (sha256 (base32 - "1zhrs2p3c831rwx7ww87i82k5i236vfywdxv7zhz93k3vffyqby7")))) + "0yca3yb85hvl33ny09xvm67c3wih4nafrbfdgpf7fsrxy1jc75iq")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules)) (inputs - (list boost kactivities kconfig qtbase-5 qtdeclarative-5)) - (home-page "https://community.kde.org/Frameworks") + (list boost plasma-activities kconfig qtbase qtdeclarative)) + (home-page "https://invent.kde.org/plasma/plasma-activities-stats") (synopsis "Access usage statistics collected by the activity manager") (description "The KActivitiesStats library provides a querying mechanism for the data that the activity manager collects---which documents have been opened @@ -2285,7 +3168,7 @@ by which applications, and what documents have been linked to which activity.") (define-public kbookmarks (package (name "kbookmarks") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -2294,12 +3177,12 @@ by which applications, and what documents have been linked to which activity.") name "-" version ".tar.xz")) (sha256 (base32 - "06lnsyjhh80mdcqjww40glinmrjydbmkhv27a267vf34r7kam9rc")))) + "18gydjkjl9iwz5579xqw940d5w8by8ki7qli392w5c46mfm9sy7h")))) (build-system cmake-build-system) (propagated-inputs (list kwidgetsaddons)) (native-inputs - (list extra-cmake-modules qttools-5)) + (list extra-cmake-modules qttools)) (inputs (list kauth kcodecs @@ -2307,26 +3190,57 @@ by which applications, and what documents have been linked to which activity.") kconfigwidgets kcoreaddons kiconthemes + kcolorscheme kxmlgui - qtbase-5)) + qtdeclarative + qtbase)) (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'check 'check-setup - (lambda _ - (setenv "HOME" (getcwd)) - ;; make Qt render "offscreen", required for tests - (setenv "QT_QPA_PLATFORM" "offscreen")))))) + (list + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'check-setup + (lambda _ + (setenv "HOME" (getcwd)) + ;; make Qt render "offscreen", required for tests + (setenv "QT_QPA_PLATFORM" "offscreen")))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Bookmarks management library") (description "KBookmarks lets you access and manipulate bookmarks stored using the XBEL format.") (license license:lgpl2.1+))) +(define-public kbookmarks-5 + (package + (inherit kbookmarks) + (name "kbookmarks") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "01cg6qsfjr59ncrxwmiid36cpzynjwxgfydgk23j29bk9gjml2jl")))) + (propagated-inputs + (list kwidgetsaddons-5)) + (native-inputs + (list extra-cmake-modules qttools-5)) + (inputs + (list kauth-5 + kcodecs-5 + kconfig-5 + kconfigwidgets-5 + kcoreaddons-5 + kiconthemes-5 + kxmlgui-5 + qtbase-5)))) + (define-public kcmutils (package (name "kcmutils") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -2335,10 +3249,58 @@ using the XBEL format.") name "-" version ".tar.xz")) (sha256 (base32 - "1pblf3c60m0gn3vhdprw28f8y54kij02jwz91r2vnmng8d1xkrp9")))) + "0h4fjav5r2hc8520yh5hwvxw982rad3sf9n1vjffbj93wj6b164r")))) (build-system cmake-build-system) (propagated-inputs - (list kconfigwidgets kservice)) + (list kconfigwidgets + kcoreaddons + qtdeclarative)) + (native-inputs + (list extra-cmake-modules + gettext-minimal + qttools + ;; required by kcmloadtest test + kirigami)) + (inputs + (list kio + kcompletion + kguiaddons + kiconthemes + kitemviews + ki18n + kcolorscheme + kwidgetsaddons + kxmlgui + qtbase)) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'check-setup + (lambda _ + (setenv "QT_QPA_PLATFORM" "offscreen")))))) + (home-page "https://community.kde.org/Frameworks") + (synopsis "Utilities for KDE System Settings modules") + (description "KCMUtils provides various classes to work with KCModules. +KCModules can be created with the KConfigWidgets framework.") + (license license:lgpl2.1+))) + +(define-public kcmutils-5 + (package + (inherit kcmutils) + (name "kcmutils") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "06aw308wv3fyl1g60n1i2hxx74f0isdsfwwzidsjk79danyqsa4i")))) + (propagated-inputs + (list kconfigwidgets-5 kservice-5)) (native-inputs (list extra-cmake-modules)) (arguments @@ -2364,30 +3326,25 @@ using the XBEL format.") (lambda _ (setenv "QT_QPA_PLATFORM" "offscreen")))))) (inputs - (list kauth - kcodecs - kconfig - kcoreaddons - kdeclarative - kguiaddons - kiconthemes - kitemviews - ki18n - kpackage - kwidgetsaddons - kxmlgui + (list kauth-5 + kcodecs-5 + kconfig-5 + kcoreaddons-5 + kdeclarative-5 + kguiaddons-5 + kiconthemes-5 + kitemviews-5 + ki18n-5 + kpackage-5 + kwidgetsaddons-5 + kxmlgui-5 qtbase-5 - qtdeclarative-5)) - (home-page "https://community.kde.org/Frameworks") - (synopsis "Utilities for KDE System Settings modules") - (description "KCMUtils provides various classes to work with KCModules. -KCModules can be created with the KConfigWidgets framework.") - (license license:lgpl2.1+))) + qtdeclarative-5)))) (define-public kconfigwidgets (package (name "kconfigwidgets") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -2396,21 +3353,22 @@ KCModules can be created with the KConfigWidgets framework.") name "-" version ".tar.xz")) (sha256 (base32 - "16layydkcwfbvzxqjzprkq8bbxifn0z0wm7mc9bzwrfxy761rjnj")))) + "14104r6j38kjqmvx3d66xm4amdbdxl1450257l6zlf9wp1lndj5s")))) (build-system qt-build-system) (propagated-inputs - (list kauth kcodecs kconfig kwidgetsaddons)) + (list kcodecs kconfig kcolorscheme kwidgetsaddons)) (native-inputs - (list extra-cmake-modules kdoctools qttools-5)) + (list extra-cmake-modules kdoctools qttools)) (inputs (list kcoreaddons kguiaddons ki18n ;; todo: PythonModuleGeneration - qtbase-5 - qttools-5)) + qtdeclarative + libxkbcommon)) (arguments (list + #:qtbase qtbase #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch @@ -2424,7 +3382,8 @@ KCModules can be created with the KConfigWidgets framework.") (when tests? (setenv "HOME" (getcwd)) - (invoke "ctest" "-E" "kstandardactiontest"))))))) + (invoke "ctest" "-E" "(kstandardactiontest|\ +klanguagenametest)"))))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Widgets for configuration dialogs") (description "KConfigWidgets provides easy-to-use classes to create @@ -2433,10 +3392,50 @@ their settings.") ;; dual licensed (license (list license:gpl2+ license:lgpl2.1+)))) +(define-public kconfigwidgets-5 + (package + (inherit kconfigwidgets) + (name "kconfigwidgets") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1f65ayyyadiajf7xgf7369rly2yzigh6gqlb0nkgg8cp2bq9fmp4")))) + (propagated-inputs + (list kauth-5 kcodecs-5 kconfig-5 kwidgetsaddons-5)) + (native-inputs + (list extra-cmake-modules kdoctools-5 qttools-5)) + (inputs + (list kcoreaddons-5 + kguiaddons-5 + ;; todo: PythonModuleGeneration + ki18n-5)) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch + (lambda _ + (substitute* "src/khelpclient.cpp" + ;; make QDirIterator follow symlinks + (("^\\s*(QDirIterator it\\(.*, QDirIterator::Subdirectories)(\\);)" _ a b) + (string-append a " | QDirIterator::FollowSymlinks" b))))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "HOME" + (getcwd)) + (invoke "ctest" "-E" "kstandardactiontest"))))))))) + (define-public kdeclarative (package (name "kdeclarative") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -2445,29 +3444,63 @@ their settings.") name "-" version ".tar.xz")) (sha256 (base32 - "0w98pj8acxb4m9645963rzq5vja1fbih5czz24mf9zdqlg2dkz8g")))) + "1kkdlkavd3v60sihxvlqxw2fmv1szf04llffhm0db7kmhz286zc0")))) (build-system cmake-build-system) (propagated-inputs - (list kconfig kpackage qtdeclarative-5)) + (list kconfig qtdeclarative)) (native-inputs - (list dbus extra-cmake-modules pkg-config xorg-server-for-tests)) + (list extra-cmake-modules)) (inputs - (list kauth - kcoreaddons - kglobalaccel + (list kglobalaccel kguiaddons - kiconthemes - kio ki18n - kjobwidgets - knotifications - kservice kwidgetsaddons - kwindowsystem + qtshadertools + qtbase)) + (home-page "https://community.kde.org/Frameworks") + (synopsis "Integration of QML and KDE work spaces") + (description "KDeclarative provides integration of QML and KDE work spaces. +It's comprises two parts: a library used by the C++ part of your application to +intergrate QML with KDE Frameworks specific features, and a series of QML imports +that offer bindings to some of the Frameworks.") + ;; dual licensed + (license (list license:gpl2+ license:lgpl2.1+)))) + +(define-public kdeclarative-5 + (package + (inherit kdeclarative) + (name "kdeclarative") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0py5x9ia8p7ngk1q3nqwqi1b9zv6jdxc23qam8xyqbfjqcm9qzwy")))) + (propagated-inputs + (list kconfig-5 kpackage-5 qtdeclarative-5)) + (native-inputs + (list dbus extra-cmake-modules pkg-config xorg-server-for-tests)) + (inputs + (list kauth-5 + kcoreaddons-5 + kglobalaccel-5 + kguiaddons-5 + kiconthemes-5 + kio-5 + ki18n-5 + kjobwidgets-5 + knotifications-5 + kservice-5 + kwidgetsaddons-5 + kwindowsystem-5 libepoxy qtbase-5 qtdeclarative-5 - solid)) + solid-5)) (arguments (list #:phases #~(modify-phases %standard-phases @@ -2486,20 +3519,12 @@ their settings.") (getcwd)) (setenv "QT_QPA_PLATFORM" "offscreen") (setenv "DBUS_FATAL_WARNINGS" "0") - (invoke "dbus-launch" "ctest"))))))) - (home-page "https://community.kde.org/Frameworks") - (synopsis "Integration of QML and KDE work spaces") - (description "KDeclarative provides integration of QML and KDE work spaces. -It's comprises two parts: a library used by the C++ part of your application to -intergrate QML with KDE Frameworks specific features, and a series of QML imports -that offer bindings to some of the Frameworks.") - ;; dual licensed - (license (list license:gpl2+ license:lgpl2.1+)))) + (invoke "dbus-launch" "ctest"))))))))) (define-public kded (package (name "kded") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -2508,7 +3533,7 @@ that offer bindings to some of the Frameworks.") name "-" version ".tar.xz")) (sha256 (base32 - "00n4isc4ahii0ldrg761lkmnq27kmrfqs9zkmpvmgbg57259mvc3")))) + "0j2y4gk7vaqwia8kpk2glfch84rpwrcbjfksvw9bmdhip9ffbcyl")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules kdoctools)) @@ -2519,7 +3544,7 @@ that offer bindings to some of the Frameworks.") kdbusaddons kdoctools kservice - qtbase-5)) + qtbase)) (home-page "https://community.kde.org/Frameworks") (synopsis "Central daemon of KDE work spaces") (description "KDED stands for KDE Daemon. KDED runs in the background and @@ -2528,6 +3553,31 @@ started on demand.") ;; dual licensed (license (list license:lgpl2.0+ license:lgpl2.1+)))) +(define-public kded-5 + (package + (inherit kded) + (name "kded") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0gd0dy748zw12xksk7xmv1xkra2g9s3av4d0i1d7dbb6z1ap5djw")))) + (native-inputs + (list extra-cmake-modules kdoctools-5)) + (inputs + (list kconfig-5 + kcoreaddons-5 + kcrash-5 + kdbusaddons-5 + kdoctools-5 + kservice-5 + qtbase-5)))) + (define-public kdesignerplugin (package (name "kdesignerplugin") @@ -2560,7 +3610,7 @@ ini-style description files.") (define-public kdesu (package (name "kdesu") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -2569,14 +3619,16 @@ ini-style description files.") name "-" version ".tar.xz")) (sha256 (base32 - "14dcf32izn4lxr8vx372rfznflc1rcxwanx06phkd8mx9zyg4jxr")))) + "1pp7m4k42wv1m9wy83ysnv1j0nji7py668320xwpfirkh6hhb6d3")))) (build-system cmake-build-system) (propagated-inputs (list kpty)) (native-inputs (list extra-cmake-modules)) (inputs - (list kconfig kcoreaddons ki18n kservice qtbase-5)) + (list kconfig kcoreaddons ki18n kservice qtbase)) + ;; FIXME: kdesutest test fail. + (arguments (list #:tests? #f)) (home-page "https://community.kde.org/Frameworks") (synopsis "User interface for running shell commands with root privileges") (description "KDESU provides functionality for building GUI front ends for @@ -2587,7 +3639,7 @@ with su and ssh respectively.") (define-public kemoticons (package (name "kemoticons") - (version "5.114.0") + (version "5.116.0") (source (origin (method url-fetch) (uri (string-append @@ -2596,14 +3648,14 @@ with su and ssh respectively.") name "-" version ".tar.xz")) (sha256 (base32 - "0w87prkhdmba7y8ylbycdpwdzd2djmp7hvv5ljb9s4aqqhnn3vw4")))) + "0lv8cb7h7v4fbf8vyrsf9kygnhjxznf5sj92nv5is5gy0wdk8qxc")))) (build-system cmake-build-system) (propagated-inputs - (list kservice)) + (list kservice-5)) (native-inputs (list extra-cmake-modules)) (inputs - (list karchive kconfig kcoreaddons qtbase-5)) + (list karchive-5 kconfig-5 kcoreaddons-5 qtbase-5)) (arguments (list #:phases #~(modify-phases %standard-phases (add-before 'check 'check-setup @@ -2623,7 +3675,7 @@ emoticons coming from different providers.") (define-public kglobalaccel (package (name "kglobalaccel") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -2632,20 +3684,18 @@ emoticons coming from different providers.") name "-" version ".tar.xz")) (sha256 (base32 - "19mmav055fnzyl760fyhf0pdvaidd5i1h04l2hcnpin4p1jnpfap")))) + "1wcx0b3vi5xm5hhyylkdrcq8i46m49lw1j53m2i2f4nv7750d0n0")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules pkg-config qttools-5)) + (list extra-cmake-modules pkg-config qttools)) (inputs (list kconfig kcrash kcoreaddons kdbusaddons kwindowsystem - qtbase-5 - qtx11extras - qtdeclarative-5 - xcb-util-keysyms)) + qtdeclarative)) + (arguments (list #:qtbase qtbase)) (home-page "https://community.kde.org/Frameworks") (synopsis "Global desktop keyboard shortcuts") (description "KGlobalAccel allows you to have global accelerators that are @@ -2653,10 +3703,37 @@ independent of the focused window. Unlike regular shortcuts, the application's window does not need focus for them to be activated.") (license license:lgpl2.1+))) +(define-public kglobalaccel-5 + (package + (inherit kglobalaccel) + (name "kglobalaccel") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0rlqclaq4szzqa2kz7c9ad81rm0b2byr806l5v0xz968h8jampzn")))) + (native-inputs + (list extra-cmake-modules pkg-config qttools-5)) + (inputs + (list kconfig-5 + kcrash-5 + kcoreaddons-5 + kdbusaddons-5 + kwindowsystem-5 + qtx11extras + qtdeclarative-5 + xcb-util-keysyms)) + (arguments '()))) + (define-public kiconthemes (package (name "kiconthemes") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -2665,20 +3742,67 @@ window does not need focus for them to be activated.") name "-" version ".tar.xz")) (sha256 (base32 - "0ndiqmcs1ybj4acc6k3p9jwq09slqc4nj12ifqvlxrfj3ak6sb28")))) + "00y3gjrplxk29l0f11yf7d9cszzf7ggady87pwj7j87qr6pr8lwl")))) (build-system cmake-build-system) (native-inputs - (list extra-cmake-modules qttools-5 shared-mime-info)) + (list extra-cmake-modules qttools shared-mime-info)) (inputs - (list karchive + (list libxkbcommon + karchive kauth kcodecs + kcolorscheme kcoreaddons kconfig kconfigwidgets ki18n kitemviews kwidgetsaddons + qtbase + qtdeclarative + qtsvg + breeze-icons)) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (add-before 'check 'check-setup + (lambda* (#:key inputs #:allow-other-keys) + (setenv "HOME" (getcwd)) + ;; make Qt render "offscreen", required for tests + (setenv "QT_QPA_PLATFORM" "offscreen")))))) + (home-page "https://community.kde.org/Frameworks") + (synopsis "Icon GUI utilities") + (description "This library contains classes to improve the handling of icons +in applications using the KDE Frameworks.") + (license license:lgpl2.1+))) + +(define-public kiconthemes-5 + (package + (inherit kiconthemes) + (name "kiconthemes") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0q859zbjys7lajwpgl78ji4dif7cxdxirqb8b6f7k7bk53ignvly")))) + (build-system cmake-build-system) + (native-inputs + (list extra-cmake-modules qttools-5 shared-mime-info)) + (inputs + (list karchive-5 + kauth-5 + kcodecs-5 + kcoreaddons-5 + kconfig-5 + kconfigwidgets-5 + ki18n-5 + kitemviews-5 + kwidgetsaddons-5 qtbase-5 qtdeclarative-5 qtsvg-5)) @@ -2693,17 +3817,12 @@ window does not need focus for them to be activated.") "/share")) (setenv "HOME" (getcwd)) ;; make Qt render "offscreen", required for tests - (setenv "QT_QPA_PLATFORM" "offscreen")))))) - (home-page "https://community.kde.org/Frameworks") - (synopsis "Icon GUI utilities") - (description "This library contains classes to improve the handling of icons -in applications using the KDE Frameworks.") - (license license:lgpl2.1+))) + (setenv "QT_QPA_PLATFORM" "offscreen")))))))) (define-public kinit (package (name "kinit") - (version "5.114.0") + (version "5.116.0") (source (origin (method url-fetch) (uri (string-append @@ -2712,7 +3831,7 @@ in applications using the KDE Frameworks.") name "-" version ".tar.xz")) (sha256 (base32 - "0b6z9gq05vz20hm5y9ai3sbqq3gxwm3a3z88dkvi7dywk7vbqcph")) + "0b5w7pk7wbyzix2jvn3yk89f9r620wrx55v3cgvj4p83c73ar974")) ;; Use the store paths for other packages and dynamically loaded ;; libs (patches (search-patches "kinit-kdeinit-extra_libs.patch")))) @@ -2736,29 +3855,29 @@ in applications using the KDE Frameworks.") (native-inputs (list extra-cmake-modules pkg-config)) (inputs - (list kauth - kbookmarks - kcodecs - kcompletion - kconfig - kconfigwidgets - kcoreaddons - kcrash - kdbusaddons - kdoctools - kio - kitemviews - ki18n - kjobwidgets - kparts - kservice - kwidgetsaddons - kwindowsystem - kxmlgui + (list kauth-5 + kbookmarks-5 + kcodecs-5 + kcompletion-5 + kconfig-5 + kconfigwidgets-5 + kcoreaddons-5 + kcrash-5 + kdbusaddons-5 + kdoctools-5 + kio-5 + kitemviews-5 + ki18n-5 + kjobwidgets-5 + kparts-5 + kservice-5 + kwidgetsaddons-5 + kwindowsystem-5 + kxmlgui-5 libcap ; to install start_kdeinit with CAP_SYS_RESOURCE plasma-framework qtbase-5 - solid)) + solid-5)) (home-page "https://community.kde.org/Frameworks") (synopsis "Library to speed up start of applications on KDE workspaces") (description "Kdeinit is a process launcher similar to init used for booting @@ -2769,10 +3888,13 @@ consumption.") ;; dual licensed (license (list license:lgpl2.0+ license:lgpl2.1+)))) +(define kinit-bootstrap + ((package-input-rewriting `((,kdbusaddons-5 . ,kdbusaddons-5-bootstrap))) kinit)) + (define-public kio (package (name "kio") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -2781,7 +3903,7 @@ consumption.") name "-" version ".tar.xz")) (sha256 (base32 - "0nwmxbfhvfw69q07vxvflri7rkdczyc89xv4ll3nrzrhgf15kb2z")) + "0j04kbbmjlbv2qhra5src6zxx1m8imix9hb0kih0b5h64jrszq9r")) (patches (search-patches "kio-search-smbd-on-PATH.patch")))) (build-system cmake-build-system) (propagated-inputs @@ -2794,12 +3916,10 @@ consumption.") kjobwidgets kservice kwindowsystem - kxmlgui solid)) (native-inputs - (list extra-cmake-modules dbus kdoctools qttools-5)) - (inputs (list mit-krb5 - karchive + (list extra-cmake-modules dbus kdoctools qttools)) + (inputs (list karchive kauth kcodecs kconfigwidgets @@ -2809,17 +3929,130 @@ consumption.") kguiaddons kiconthemes ki18n - knotifications - ktextwidgets kwallet kwidgetsaddons libxml2 libxslt + qt5compat + qtbase + qtdeclarative + libxkbcommon + sonnet + `(,util-linux "lib") ; libmount + zlib)) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch + (lambda _ + ;; Better error message (taken from NixOS) + (substitute* "src/kiod/kiod_main.cpp" + (("(^\\s*qCWarning(KIOD_CATEGORY) << \ +\"Error loading plugin:\")( << loader.errorString();)" _ a b) + (string-append a "<< name" b))))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "HOME" (getcwd)) + (setenv "XDG_RUNTIME_DIR" (getcwd)) + (setenv "QT_QPA_PLATFORM" "offscreen") + (setenv "DBUS_FATAL_WARNINGS" "0") + (invoke "dbus-launch" "ctest" + "--rerun-failed" "--output-on-failure" + "-E" + + (string-append + "(kiogui-favicontest" + "|kiocore-filefiltertest" + "|kpasswdservertest" + "|kiowidgets-kfileitemactionstest" + "|kiofilewidgets-kfileplacesmodeltest" + ;; The following tests fail or are flaky (see: + ;; https://bugs.kde.org/show_bug.cgi?id=440721). + "|kiocore-jobtest" + "|kiocore-kmountpointtest" + "|kiowidgets-kdirlistertest" + "|kiocore-kfileitemtest" + "|kiocore-ktcpsockettest" + "|kiocore-mimetypefinderjobtest" + "|kiocore-krecentdocumenttest" + "|kiocore-http_jobtest" + "|kiogui-openurljobtest" + "|kioslave-httpheaderdispositiontest" + "|applicationlauncherjob_forkingtest" + "|applicationlauncherjob_scopetest" + "|applicationlauncherjob_servicetest" + "|commandlauncherjob_forkingtest" + "|commandlauncherjob_scopetest" + "|commandlauncherjob_servicetest" + "|kiowidgets-kdirmodeltest" + "|kiowidgets-kurifiltertest-colon-separator" + "|kiofilewidgets-kfilewidgettest" + "|kiowidgets-kurifiltertest-space-separator" + "|kioworker-httpheaderdispositiontest)")))))))) + (home-page "https://community.kde.org/Frameworks") + (synopsis "Network transparent access to files and data") + (description "This framework implements a lot of file management functions. +It supports accessing files locally as well as via HTTP and FTP out of the box +and can be extended by plugins to support other protocols as well. There is a +variety of plugins available, e.g. to support access via SSH. The framework can +also be used to bridge a native protocol to a file-based interface. This makes +the data accessible in all applications using the KDE file dialog or any other +KIO enabled infrastructure.") + (license license:lgpl2.1+))) + +(define-public kio-5 + (package + (inherit kio) + (name "kio") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0nhins85cqlr3xz4xi0g54rshagphin3pjjx2qxs0fcwcpb1kdzg")) + (patches (search-patches "kio-search-smbd-on-PATH.patch")))) + (propagated-inputs + (list acl + kbookmarks-5 + kconfig-5 + kcompletion-5 + kcoreaddons-5 + kitemviews-5 + kjobwidgets-5 + kservice-5 + kwindowsystem-5 + kxmlgui-5 + solid-5)) + (native-inputs + (list extra-cmake-modules dbus kdoctools-5 qttools-5)) + (inputs (list mit-krb5 + karchive-5 + kauth-5 + kcodecs-5 + kconfigwidgets-5 + kcrash-5 + kdbusaddons-5 + kded-5 + kguiaddons-5 + kiconthemes-5 + ki18n-5 + knotifications-5 + ktextwidgets-5 + kwallet-5 + kwidgetsaddons-5 + libxml2 + libxslt qtbase-5 qtdeclarative-5 qtscript qtx11extras - sonnet + sonnet-5 `(,util-linux "lib") ; libmount zlib)) (arguments @@ -2867,28 +4100,15 @@ consumption.") "|kiowidgets-kurifiltertest-space-separator" "|kioworker-httpheaderdispositiontest)"))))) (add-after 'install 'add-symlinks - ;; Some package(s) (e.g. bluedevil) refer to these service types by - ;; the wrong name. I would prefer to patch those packages, but I - ;; cannot find the files! (lambda* (#:key outputs #:allow-other-keys) (let ((kst5 (string-append #$output "/share/kservicetypes5/"))) (symlink (string-append kst5 "kfileitemactionplugin.desktop") - (string-append kst5 "kfileitemaction-plugin.desktop")))))))) - (home-page "https://community.kde.org/Frameworks") - (synopsis "Network transparent access to files and data") - (description "This framework implements a lot of file management functions. -It supports accessing files locally as well as via HTTP and FTP out of the box -and can be extended by plugins to support other protocols as well. There is a -variety of plugins available, e.g. to support access via SSH. The framework can -also be used to bridge a native protocol to a file-based interface. This makes -the data accessible in all applications using the KDE file dialog or any other -KIO enabled infrastructure.") - (license license:lgpl2.1+))) + (string-append kst5 "kfileitemaction-plugin.desktop")))))))))) (define-public knewstuff (package (name "knewstuff") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -2897,41 +4117,31 @@ KIO enabled infrastructure.") name "-" version ".tar.xz")) (sha256 (base32 - "15xmx7rnnrsz2cj044aviyr4hi9h8r0nnva9qzcjcq2hkkgj7wjj")))) + "1mv7v4r902q2mgr377mg5c2y6aapg32p385ildcm3jwl5sr1cvd1")))) (build-system cmake-build-system) (propagated-inputs - (list attica kservice kxmlgui)) + (list attica + kcoreaddons)) (native-inputs - (list extra-cmake-modules qttools-5)) + (list extra-cmake-modules qttools)) (inputs (list karchive - kauth - kbookmarks - kcodecs - kcompletion kconfig - kconfigwidgets - kcoreaddons - kio - kitemviews + kirigami ki18n - kiconthemes - kjobwidgets kpackage - ktextwidgets kwidgetsaddons - qtbase-5 - qtdeclarative-5 - solid - sonnet)) + qtbase + qtdeclarative + syndication)) (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'check 'check-setup - (lambda _ ; XDG_DATA_DIRS isn't set - (setenv "HOME" (getcwd)) - ;; make Qt render "offscreen", required for tests - (setenv "QT_QPA_PLATFORM" "offscreen")))))) + (list #:phases + #~(modify-phases %standard-phases + (add-before 'check 'check-setup + (lambda _ ; XDG_DATA_DIRS isn't set + (setenv "HOME" (getcwd)) + ;; make Qt render "offscreen", required for tests + (setenv "QT_QPA_PLATFORM" "offscreen")))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Framework for downloading and sharing additional application data") (description "The KNewStuff library implements collaborative data sharing @@ -2939,10 +4149,50 @@ for applications. It uses libattica to support the Open Collaboration Services specification.") (license license:lgpl2.1+))) +(define-public knewstuff-5 + (package + (inherit knewstuff) + (name "knewstuff") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "02n7429ldkyyzbk9rbr9h4ss80zhc3vnir29q2yksyhcyqkkjc42")))) + (propagated-inputs + (list attica-5 kservice-5 kxmlgui-5)) + (native-inputs + (list extra-cmake-modules qttools-5)) + (inputs + (list karchive-5 + kauth-5 + kbookmarks-5 + kcodecs-5 + kcompletion-5 + kconfig-5 + kconfigwidgets-5 + kcoreaddons-5 + kio-5 + kitemviews-5 + ki18n-5 + kiconthemes-5 + kjobwidgets-5 + kpackage-5 + ktextwidgets-5 + kwidgetsaddons-5 + qtbase-5 + qtdeclarative-5 + solid-5 + sonnet-5)))) + (define-public knotifyconfig (package (name "knotifyconfig") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -2951,7 +4201,7 @@ specification.") name "-" version ".tar.xz")) (sha256 (base32 - "049n64qlr69zv1dc1dhgbsca37179hp06xfsxnhg97lblz3p3gds")))) + "0paj00lsqlk40xwkhm0z7hims22mknp8m1cs5sqssgp5a5g6zwpb")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules)) @@ -2972,7 +4222,7 @@ specification.") kwidgetsaddons kxmlgui phonon - qtbase-5 + qtbase solid)) (home-page "https://community.kde.org/Frameworks") (synopsis "Configuration dialog for desktop notifications") @@ -2981,10 +4231,46 @@ notifications which can be embedded in your application.") ;; dual licensed (license (list license:lgpl2.0+ license:lgpl2.1+)))) +(define-public knotifyconfig-5 + (package + (inherit knotifyconfig) + (name "knotifyconfig") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0zwrcdl565nlzf6q2zljq6xn8929frrhqr8jlmb6kcv5i93yals0")))) + (native-inputs + (list extra-cmake-modules)) + (inputs + (list kauth-5 + kbookmarks-5 + kcodecs-5 + kcompletion-5 + kconfig-5 + kconfigwidgets-5 + kcoreaddons-5 + kio-5 + kitemviews-5 + ki18n-5 + kjobwidgets-5 + knotifications-5 + kservice-5 + kwidgetsaddons-5 + kxmlgui-5 + phonon + qtbase-5 + solid-5)))) + (define-public kparts (package (name "kparts") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -2993,48 +4279,78 @@ notifications which can be embedded in your application.") name "-" version ".tar.xz")) (sha256 (base32 - "1rrf765p554r7l8j23gx5zxdq6wimh0v91qdkwz7ilm2qr16vd5v")))) + "0004ln6fby8jgx6j27qlhmlagxy7c70akn0kayfqi6glfdk2gz22")))) (build-system qt-build-system) (arguments - '(#:phases (modify-phases %standard-phases - (add-after 'unpack 'disable-partloader-test - (lambda _ - (substitute* "autotests/CMakeLists.txt" - ;; XXX: PartLoaderTest wants to create a .desktop file - ;; in the common locations and test that MIME types work. - ;; The setup required for this is extensive, skip for now. - (("partloadertest\\.cpp") ""))))))) + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'disable-partloader-test + (lambda _ + (substitute* "autotests/CMakeLists.txt" + ;; XXX: PartLoaderTest wants to create a .desktop file + ;; in the common locations and test that MIME types work. + ;; The setup required for this is extensive, skip for now. + (("partloadertest\\.cpp") ""))))))) (propagated-inputs - (list kio ktextwidgets kxmlgui)) + (list kio kservice kxmlgui)) (native-inputs (list extra-cmake-modules shared-mime-info)) (inputs - (list kauth - kbookmarks - kcodecs - kcompletion - kconfig - kconfigwidgets - kcoreaddons - kiconthemes - kitemviews - ki18n - kjobwidgets - kservice - kwidgetsaddons - qtbase-5 - solid - sonnet)) + (list + kcompletion + kconfig + kcoreaddons + kitemviews + ki18n + kjobwidgets + kwidgetsaddons + qtbase)) (home-page "https://community.kde.org/Frameworks") (synopsis "Plugin framework for user interface components") (description "This library implements the framework for KDE parts, which are widgets with a user-interface defined in terms of actions.") (license license:lgpl2.1+))) +(define-public kparts-5 + (package + (inherit kparts) + (name "kparts") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0czrlqh5cxnj1mlbz839c7hifhnpzl476d92lv4hxji50wnjlfqr")))) + (propagated-inputs + (list kio-5 ktextwidgets-5 kxmlgui-5)) + (native-inputs + (list extra-cmake-modules shared-mime-info)) + (inputs + (list kauth-5 + kbookmarks-5 + kcodecs-5 + kcompletion-5 + kconfig-5 + kconfigwidgets-5 + kcoreaddons-5 + kiconthemes-5 + kitemviews-5 + ki18n-5 + kjobwidgets-5 + kservice-5 + kwidgetsaddons-5 + qtbase-5 + solid-5 + sonnet-5)))) + (define-public kpeople (package (name "kpeople") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -3043,7 +4359,7 @@ widgets with a user-interface defined in terms of actions.") name "-" version ".tar.xz")) (sha256 (base32 - "04v0s3amn6lbb16qvp1r6figckva6xk8z7djk8jda8fbnx8dx2r1")))) + "0gihf93jjy3qc02h9qjnxjp67jb38rahx5f1k1hm9pxcasg9fzwn")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) @@ -3053,11 +4369,12 @@ widgets with a user-interface defined in terms of actions.") kitemviews ki18n kservice + kcontacts kwidgetsaddons - qtbase-5 - qtdeclarative-5)) + qtdeclarative)) (arguments - `(#:tests? #f)) ; FIXME: 1/3 tests fail. + (list #:qtbase qtbase + #:tests? #f)) ; FIXME: 1/3 tests fail. (home-page "https://community.kde.org/Frameworks") (synopsis "Provides access to all contacts and aggregates them by person") (description "KPeople offers unified access to our contacts from different @@ -3070,7 +4387,7 @@ to easily extend the contacts collection.") (define-public krunner (package (name "krunner") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -3079,9 +4396,52 @@ to easily extend the contacts collection.") name "-" version ".tar.xz")) (sha256 (base32 - "1rjs9b87bi4f6pdm9fwnha2sj2mrq260l80iz2jq1zah83p546sw")))) + "09g464v1v7c14m39ic3qpny10l4dnazr7fax76irs3dwr54zx9kc")))) (build-system qt-build-system) (propagated-inputs + (list kcoreaddons)) + (native-inputs + (list extra-cmake-modules + ;; For tests. + dbus)) + (inputs + (list kconfig + kitemmodels + ki18n + qtdeclarative)) + (arguments + (list + #:qtbase qtbase + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "HOME" (getcwd)) + (invoke "dbus-launch" "ctest"))))))) + (home-page "https://community.kde.org/Frameworks") + (synopsis "Framework for Plasma runners") + (description "The Plasma workspace provides an application called KRunner +which, among other things, allows one to type into a text area which causes +various actions and information that match the text appear as the text is being +typed.") + (license license:lgpl2.1+))) + +(define-public krunner-5 + (package + (inherit krunner) + (name "krunner") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0h889a4bj7vqhvy9hkqxd9v437zly73phyav10gv5b2l8fgb4zxq")))) + (propagated-inputs (list plasma-framework)) (native-inputs (list extra-cmake-modules @@ -3089,25 +4449,25 @@ to easily extend the contacts collection.") dbus)) (inputs (list kactivities - kauth - kbookmarks - kcodecs - kcompletion - kconfig - kconfigwidgets - kcoreaddons - kio - kitemviews - ki18n - kjobwidgets - kpackage - kservice - kwidgetsaddons - kwindowsystem - kxmlgui + kauth-5 + kbookmarks-5 + kcodecs-5 + kcompletion-5 + kconfig-5 + kconfigwidgets-5 + kcoreaddons-5 + kio-5 + kitemviews-5 + ki18n-5 + kjobwidgets-5 + kpackage-5 + kservice-5 + kwidgetsaddons-5 + kwindowsystem-5 + kxmlgui-5 qtdeclarative-5 - solid - threadweaver)) + solid-5 + threadweaver-5)) (arguments (list #:phases @@ -3126,19 +4486,12 @@ to easily extend the contacts collection.") (when tests? (setenv "HOME" (getcwd)) (setenv "QT_QPA_PLATFORM" "offscreen") - (invoke "dbus-launch" "ctest"))))))) - (home-page "https://community.kde.org/Frameworks") - (synopsis "Framework for Plasma runners") - (description "The Plasma workspace provides an application called KRunner -which, among other things, allows one to type into a text area which causes -various actions and information that match the text appear as the text is being -typed.") - (license license:lgpl2.1+))) + (invoke "dbus-launch" "ctest"))))))))) (define-public kservice (package (name "kservice") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -3147,37 +4500,43 @@ typed.") name "-" version ".tar.xz")) (sha256 (base32 - "0jdvlplnsb9w628wh3ip6awxvhgyc097zh7ls9614ymkbnpc9xca")))) + "0m7ym2hzsw1aylrinqmq88912mi89j0wyffb1lxjkwp0q5i4smm0")))) (build-system cmake-build-system) (propagated-inputs (list kconfig kcoreaddons kdoctools)) (native-inputs (list bison extra-cmake-modules flex shared-mime-info)) (inputs - (list kcrash kdbusaddons kdoctools ki18n qtbase-5)) + (list kcrash kdbusaddons kdoctools ki18n qtbase qtdeclarative)) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch - ;; Adopted from NixOS' patches "qdiriterator-follow-symlinks" and - ;; "no-canonicalize-path". - (lambda _ - (substitute* "src/sycoca/kbuildsycoca.cpp" - ;; make QDirIterator follow symlinks - (("^\\s*(QDirIterator it\\(.*, QDirIterator::Subdirectories)(\\);)" _ a b) - (string-append a " | QDirIterator::FollowSymlinks" b))) - (substitute* "src/sycoca/vfolder_menu.cpp" - ;; Normalize path, but don't resolve symlinks (taken from - ;; NixOS) - (("^\\s*QString resolved = QDir\\(dir\\)\\.canonicalPath\\(\\);") - "QString resolved = QDir::cleanPath(dir);")))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (setenv "HOME" (getcwd)) - (setenv "QT_QPA_PLATFORM" "offscreen") - ;; Disable failing tests. - (invoke "ctest" "-E" "(kautostarttest|ksycocatest|kapplicationtradertest)"))))))) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch + ;; Adopted from NixOS' patches "qdiriterator-follow-symlinks" and + ;; "no-canonicalize-path". + (lambda _ + (substitute* "src/sycoca/kbuildsycoca.cpp" + ;; make QDirIterator follow symlinks + (("^\\s*(QDirIterator it\\(.*, QDirIterator::Subdirectories)(\\);)" _ a b) + (string-append a " | QDirIterator::FollowSymlinks" b))) + (substitute* "src/sycoca/vfolder_menu.cpp" + ;; Normalize path, but don't resolve symlinks (taken from + ;; NixOS) + (("^\\s*QString resolved = QDir\\(dir\\)\\.canonicalPath\\(\\);") + "QString resolved = QDir::cleanPath(dir);")))) + (add-before 'check 'check-setup + (lambda _ + (with-output-to-file "autotests/BLACKLIST" + (lambda _ + (for-each + (lambda (name) (display (string-append "[" name "]\n*\n"))) + (list "extraFileInFutureShouldRebuildSycocaOnce" + "testNonReadableSycoca")))) + (setenv "XDG_RUNTIME_DIR" (getcwd)) + (setenv "HOME" (getcwd)) + ;; Make Qt render "offscreen", required for tests + (setenv "QT_QPA_PLATFORM" "offscreen")))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Plugin framework for desktop services") (description "KService provides a plugin framework for handling desktop @@ -3186,10 +4545,77 @@ types or handled by application specific code.") ;; triple licensed (license (list license:gpl2+ license:gpl3+ license:lgpl2.1+)))) +(define-public kservice-5 + (package + (inherit kservice) + (name "kservice") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0sd8yj9a1ja97c515g9shjqyzdz0jd7rn3r06g5659nh2z1w5dsj")))) + (propagated-inputs + (list kconfig-5 kcoreaddons-5 kdoctools-5)) + (native-inputs + (list bison extra-cmake-modules flex shared-mime-info)) + (inputs + (list kcrash-5 kdbusaddons-5 kdoctools-5 ki18n-5 qtbase-5)) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch + ;; Adopted from NixOS' patches "qdiriterator-follow-symlinks" and + ;; "no-canonicalize-path". + (lambda _ + (substitute* "src/sycoca/kbuildsycoca.cpp" + ;; make QDirIterator follow symlinks + (("^\\s*(QDirIterator it\\(.*, QDirIterator::Subdirectories)(\\);)" _ a b) + (string-append a " | QDirIterator::FollowSymlinks" b))) + (substitute* "src/sycoca/vfolder_menu.cpp" + ;; Normalize path, but don't resolve symlinks (taken from + ;; NixOS) + (("^\\s*QString resolved = QDir\\(dir\\)\\.canonicalPath\\(\\);") + "QString resolved = QDir::cleanPath(dir);")))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "HOME" (getcwd)) + (setenv "QT_QPA_PLATFORM" "offscreen") + ;; Disable failing tests. + (invoke "ctest" "-E" "(kautostarttest|ksycocatest|kapplicationtradertest)"))))))))) + +(define-public kstatusnotifieritem + (package + (name "kstatusnotifieritem") + (version "6.3.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1n4c761xgr9xbcwkw5q3l3v38wmanyvpf284y141ms6vs0rjw7yf")))) + (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) + (native-inputs (list extra-cmake-modules qttools)) + (inputs (list kwindowsystem libxkbcommon)) + (home-page "https://community.kde.org/Frameworks") + (synopsis "Implementation of Status Notifier Items") + (description "This package provides a Implementation of Status Notifier +Items.") + (license (list license:cc0 license:lgpl2.0+)))) + (define-public ktexteditor (package (name "ktexteditor") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -3198,7 +4624,7 @@ types or handled by application specific code.") "ktexteditor-" version ".tar.xz")) (sha256 (base32 - "06amzk6290imi2gj3v1k3f56zdlad7zbz4wwlf34v4iibj9mfgw8")))) + "0xip50g976s9h6196nlgpzc1wvmyl051iyjyfjri610axgxbz7cp")))) (build-system cmake-build-system) (propagated-inputs (list kparts @@ -3209,52 +4635,27 @@ types or handled by application specific code.") (list editorconfig-core-c karchive kauth - kbookmarks - kcodecs kcompletion - kconfig kconfigwidgets - kcoreaddons + kcolorscheme kguiaddons - kiconthemes - kio kitemviews ki18n - kjobwidgets - kparts - kservice ktextwidgets kwidgetsaddons kxmlgui - libgit2 - perl - qtbase-5 - qtdeclarative-5 - qtscript - qtxmlpatterns - solid + qtbase + qtdeclarative + qtspeech sonnet)) (arguments (list #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'setup - (lambda* (#:key inputs #:allow-other-keys) - (setenv "XDG_DATA_DIRS" ; FIXME build phase doesn't find parts.desktop - (string-append #$(this-package-input "kparts") "/share")))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? ;; Maybe locale issues with tests? - (setenv "QT_QPA_PLATFORM" "offscreen") - (invoke "ctest" "-E" "(kateview_test|movingrange_test)")))) - (add-after 'install 'add-symlinks - ;; Some package(s) (e.g. plasma-sdk) refer to these service types - ;; by the wrong name. I would prefer to patch those packages, but - ;; I cannot find the files! - (lambda* (#:key outputs #:allow-other-keys) - (let ((kst5 (string-append #$output - "/share/kservicetypes5/"))) - (symlink (string-append kst5 "ktexteditorplugin.desktop") - (string-append kst5 "ktexteditor-plugin.desktop")))))))) + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? ;; Maybe locale issues with tests? + (setenv "QT_QPA_PLATFORM" "offscreen") + (invoke "ctest" "-E" "(kateview_test|movingrange_test)"))))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Full text editor component") (description "KTextEditor provides a powerful text editor component that you @@ -3263,10 +4664,80 @@ library.") ;; triple licensed (license (list license:gpl2+ license:lgpl2.0+ license:lgpl2.1+)))) +(define-public ktexteditor-5 + (package + (inherit ktexteditor) + (name "ktexteditor") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + "ktexteditor-" version ".tar.xz")) + (sha256 + (base32 + "0rph5nwp7d02xicjxrqpbz3kjb9kqqa40pp1w81fnq8jgln3hhh5")))) + (propagated-inputs + (list kparts-5 + ksyntaxhighlighting-5)) + (native-inputs + (list extra-cmake-modules pkg-config)) + (inputs + (list editorconfig-core-c + karchive-5 + kauth-5 + kbookmarks-5 + kcodecs-5 + kcompletion-5 + kconfig-5 + kconfigwidgets-5 + kcoreaddons-5 + kguiaddons-5 + kiconthemes-5 + kio-5 + kitemviews-5 + ki18n-5 + kjobwidgets-5 + kparts-5 + kservice-5 + ktextwidgets-5 + kwidgetsaddons-5 + kxmlgui-5 + libgit2 + perl + qtbase-5 + qtdeclarative-5 + qtscript + qtxmlpatterns + solid-5 + sonnet-5)) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'setup + (lambda* (#:key inputs #:allow-other-keys) + (setenv "XDG_DATA_DIRS" ; FIXME build phase doesn't find parts.desktop + (string-append #$(this-package-input "kparts") "/share")))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? ;; Maybe locale issues with tests? + (setenv "QT_QPA_PLATFORM" "offscreen") + (invoke "ctest" "-E" "(kateview_test|movingrange_test)")))) + (add-after 'install 'add-symlinks + ;; Some package(s) (e.g. plasma-sdk) refer to these service types + ;; by the wrong name. I would prefer to patch those packages, but + ;; I cannot find the files! + (lambda* (#:key outputs #:allow-other-keys) + (let ((kst5 (string-append #$output + "/share/kservicetypes5/"))) + (symlink (string-append kst5 "ktexteditorplugin.desktop") + (string-append kst5 "ktexteditor-plugin.desktop")))))))))) + (define-public ktextwidgets (package (name "ktextwidgets") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -3275,12 +4746,12 @@ library.") name "-" version ".tar.xz")) (sha256 (base32 - "0w1wwyd3fy351rmkhf3i55is5031j2zxvswm0b1sb3pd159v888v")))) + "0piqskblzi79wmza9z9qh0hc9vsihp5jdxsv7kspymdswspbb7wy")))) (build-system qt-build-system) (propagated-inputs (list ki18n sonnet)) (native-inputs - (list extra-cmake-modules qttools-5)) + (list extra-cmake-modules qttools)) (inputs (list kauth kcodecs @@ -3292,8 +4763,8 @@ library.") kservice kwidgetsaddons kwindowsystem - qtbase-5 - qtspeech-5)) + qtspeech)) + (arguments (list #:qtbase qtbase)) (home-page "https://community.kde.org/Frameworks") (synopsis "Text editing widgets") (description "KTextWidgets provides widgets for displaying and editing text. @@ -3301,10 +4772,66 @@ It supports rich text as well as plain text.") ;; dual licensed (license (list license:lgpl2.0+ license:lgpl2.1+)))) +(define-public ktextwidgets-5 + (package + (inherit ktextwidgets) + (name "ktextwidgets") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0lkm27g1dc6vmyjz7jaiqh2z1cfgvzlnk58wcs2bkny05i87x01l")))) + (propagated-inputs + (list ki18n-5 sonnet-5)) + (native-inputs + (list extra-cmake-modules qttools-5)) + (inputs + (list kauth-5 + kcodecs-5 + kcompletion-5 + kconfig-5 + kconfigwidgets-5 + kcoreaddons-5 + kiconthemes-5 + kservice-5 + kwidgetsaddons-5 + kwindowsystem-5 + qtbase-5 + qtspeech-5)))) + +(define-public ktexttemplate + (package + (name "ktexttemplate") + (version "6.3.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/ktexttemplate-" + version ".tar.xz")) + (sha256 + (base32 + "17df96rmmyni2adv97p77y349vyvirs0svzs6dzzmclzb2f8hlck")))) + (build-system qt-build-system) + (native-inputs + (list extra-cmake-modules)) + (inputs (list qtdeclarative)) + (arguments (list #:qtbase qtbase)) + (home-page "https://community.kde.org/Frameworks") + (synopsis "KDE's Text Template") + (description "KTextTemplate is to make it easier for application developers +to separate the structure of documents from the data they contain.") + (license (list license:lgpl2.1+)))) + (define-public kwallet (package (name "kwallet") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -3313,16 +4840,16 @@ It supports rich text as well as plain text.") name "-" version ".tar.xz")) (sha256 (base32 - "1cji8bvy5m77zljyrrgipsw8pxcds1sgikxlq3sdfxymcsw2wr36")))) + "1p9a5lwn4lpalxs6nj8fbcmmngcbgaj6s9n9vz56j26rlfzypdpd")))) (build-system cmake-build-system) (arguments (list #:phases - #~(modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? ;; Seems to require network. - (invoke "ctest" "-E" - "(fdo_secrets_test)"))))))) + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? ;; Seems to require network. + (invoke "ctest" "-E" + "(fdo_secrets_test)"))))))) (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -3343,8 +4870,8 @@ It supports rich text as well as plain text.") libgcrypt phonon qgpgme - qca - qtbase-5)) + qca-qt6 + qtbase)) (home-page "https://community.kde.org/Frameworks") (synopsis "Safe desktop-wide storage for passwords") (description "This framework contains an interface to KWallet, a safe @@ -3352,10 +4879,47 @@ desktop-wide storage for passwords and the kwalletd daemon used to safely store the passwords on KDE work spaces.") (license license:lgpl2.1+))) +(define-public kwallet-5 + (package + (inherit kwallet) + (name "kwallet") + (version "5.116.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "12s4rnybadpcjmw3dvdn68vm369h1yk7yp7mv736mj1brdg8pkhy")))) + (native-inputs + (list extra-cmake-modules kdoctools-5)) + (inputs + (list gpgme + kauth-5 + kcodecs-5 + kconfig-5 + kconfigwidgets-5 + kcoreaddons-5 + kdbusaddons-5 + kdoctools-5 + kiconthemes-5 + ki18n-5 + knotifications-5 + kservice-5 + kwidgetsaddons-5 + kwindowsystem-5 + libgcrypt + phonon + qgpgme + qca + qtbase-5)))) + (define-public kxmlgui (package (name "kxmlgui") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -3364,16 +4928,17 @@ the passwords on KDE work spaces.") name "-" version ".tar.xz")) (sha256 (base32 - "0gvjf32ssc0r0bdpb1912ldsr5rjls8vrscwy5gm9g5gw504hmmr")))) + "0plrww25q417vldf59ybiwkg3clygm7wrjy4a28wry1jxfrgswr2")))) (build-system cmake-build-system) (propagated-inputs (list kconfig kconfigwidgets)) (native-inputs - (list extra-cmake-modules qttools-5 xorg-server-for-tests)) + (list extra-cmake-modules qttools)) (inputs (list attica kauth kcodecs + kcolorscheme kcoreaddons kglobalaccel kguiaddons @@ -3383,17 +4948,24 @@ the passwords on KDE work spaces.") ktextwidgets kwidgetsaddons kwindowsystem - qtbase-5 + qtbase + qtdeclarative sonnet)) (arguments (list #:phases - #~(modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (setenv "HOME" (getcwd)) - (setenv "QT_QPA_PLATFORM" "offscreen") ;; These tests fail - (invoke "ctest" "-E" "(ktoolbar_unittest|kxmlgui_unittest)"))))))) + #~(modify-phases %standard-phases + (add-before 'check 'check-setup + (lambda* (#:key tests? #:allow-other-keys) + (with-output-to-file "autotests/BLACKLIST" + (lambda _ + (for-each + (lambda (name) + (display (string-append "[" name "]\n*\n"))) + (list "testSpecificApplicationLanguageQLocale" + "testToolButtonStyleNoXmlGui" + "testToolButtonStyleXmlGui")))) + (setenv "HOME" (getcwd)) + (setenv "QT_QPA_PLATFORM" "offscreen")))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Framework for managing menu and toolbar actions") (description "KXMLGUI provides a framework for managing menu and toolbar @@ -3403,53 +4975,116 @@ descriptions for integrating actions from plugins.") ;; dual licensed (license (list license:gpl2+ license:lgpl2.1+)))) -(define-public kxmlrpcclient +(define-public kxmlgui-5 (package - (name "kxmlrpcclient") - (version "5.114.0") + (inherit kxmlgui) + (name "kxmlgui") + (version "5.116.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/frameworks/" - (version-major+minor version) "/portingAids/" + (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 (base32 - "1fgjai3vj3yk67ynhd7blilyrdhdn5nvma3v3j1sbdg98pr7qzar")))) - (build-system cmake-build-system) + "0h3s3jcmn4pzcfxs4hywrgk92dd5hfx9hzyy14f03c0dafi6crb3")))) (propagated-inputs - (list kio)) + (list kconfig-5 kconfigwidgets-5)) (native-inputs - (list extra-cmake-modules)) + (list extra-cmake-modules qttools-5 xorg-server-for-tests)) (inputs - (list kauth - kbookmarks - kcodecs - kcompletion - kconfig - kconfigwidgets - kcoreaddons - kitemviews - ki18n - kjobwidgets - kservice - kwidgetsaddons - kxmlgui + (list attica-5 + kauth-5 + kcodecs-5 + kcoreaddons-5 + kglobalaccel-5 + kguiaddons-5 + kiconthemes-5 + kitemviews-5 + ki18n-5 + ktextwidgets-5 + kwidgetsaddons-5 + kwindowsystem-5 qtbase-5 - solid)) - (home-page "https://community.kde.org/Frameworks") - (synopsis "XML-RPC client") - (description "This library contains simple XML-RPC Client support. It is a -complete client and is easy to use. Only one interface is exposed, -kxmlrpcclient/client.h and from that interface, you only need to use 3 methods: -setUrl, setUserAgent and call.") + sonnet-5)) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "HOME" (getcwd)) + (setenv "QT_QPA_PLATFORM" "offscreen") ;; These tests fail + (invoke "ctest" "-E" "(ktoolbar_unittest|kxmlgui_unittest)"))))))))) + +(define-public libplasma + (package + (name "libplasma") + (version "6.1.2") + (source (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/plasma/" + version "/" name "-" + version ".tar.xz")) + (sha256 + (base32 + "0ji1cd8nc744lqg6m8qnbn923x57ljy5fcaxbq0fzh7qwij42qc0")))) + (build-system qt-build-system) + (propagated-inputs + (list kpackage kwindowsystem)) + (native-inputs + (list extra-cmake-modules kdoctools pkg-config + gettext-minimal + ;; for wayland-scanner + wayland)) + (inputs (list + karchive + kconfigwidgets + kglobalaccel + kguiaddons + kiconthemes + kirigami + kio + ki18n + kcmutils + ksvg + kglobalaccel + knotifications + plasma-wayland-protocols + plasma-activities + qtdeclarative + qtsvg + qtwayland + wayland + libxkbcommon)) + (arguments + (list #:qtbase qtbase + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "HOME" (getcwd)) + (invoke "ctest" "-E" + (string-append "(plasma-dialogstatetest" + "|plasma-iconitemtest" + "|plasma-dialogqmltest" + "|plasma-themetest" + "|iconitemhidpitest" + "|bug485688test" + "|dialognativetest)")))))))) + (home-page "https://invent.kde.org/plasma/libplasma") + (synopsis "Libraries, components and tools of Plasma workspaces") + (description "The plasma framework provides QML components, libplasma and +script engines.") ;; dual licensed - (license (list license:bsd-2 license:lgpl2.1+)))) + (license (list license:gpl2+ license:lgpl2.1+)))) (define-public plasma-framework (package (name "plasma-framework") - (version "5.114.0") + (version "5.116.0") (source (origin (method url-fetch) (uri (string-append @@ -3458,36 +5093,36 @@ setUrl, setUserAgent and call.") name "-" version ".tar.xz")) (sha256 (base32 - "058hl76q35bw3rzmv348azk1lmhkpgmfrxr3jd9s1hphijr8sgcx")))) + "0kwza2n9vbzf9p9dq7j448ynlfgg65918fvxw1n209zmlm6jr4vy")))) (build-system cmake-build-system) (propagated-inputs - (list kpackage kservice)) + (list kpackage-5 kservice-5)) (native-inputs - (list extra-cmake-modules kdoctools pkg-config)) + (list extra-cmake-modules kdoctools-5 pkg-config)) (inputs (list kactivities - karchive - kauth - kbookmarks - kcodecs - kcompletion - kconfig - kconfigwidgets - kcoreaddons - kdbusaddons - kdeclarative - kglobalaccel - kguiaddons - kiconthemes - kirigami - kitemviews - kio - ki18n - kjobwidgets - knotifications - kwayland - kwidgetsaddons - kwindowsystem - kxmlgui + karchive-5 + kauth-5 + kbookmarks-5 + kcodecs-5 + kcompletion-5 + kconfig-5 + kconfigwidgets-5 + kcoreaddons-5 + kdbusaddons-5 + kdeclarative-5 + kglobalaccel-5 + kguiaddons-5 + kiconthemes-5 + kirigami-5 + kitemviews-5 + kio-5 + ki18n-5 + kjobwidgets-5 + knotifications-5 + kwayland-5 + kwidgetsaddons-5 + kwindowsystem-5 + kxmlgui-5 ;; XXX: "undefined reference to `glGetString'" errors occur without libglvnd, libglvnd phonon @@ -3496,7 +5131,7 @@ setUrl, setUserAgent and call.") qtquickcontrols2-5 qtsvg-5 qtx11extras - solid)) + solid-5)) (arguments (list #:phases #~(modify-phases %standard-phases @@ -3522,7 +5157,7 @@ script engines.") (define-public purpose (package (name "purpose") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -3531,20 +5166,26 @@ script engines.") name "-" version ".tar.xz")) (sha256 (base32 - "1lj67f0x4gvbh9by3c3crbbwwnx7b9ifjna9ggziya4m6zj0m4z1")))) + "05zcwrg65z7vm1jvgfajama2mrz70gn08kdsxd5fzkxx8rk6yadz")))) (build-system cmake-build-system) (native-inputs - (list extra-cmake-modules)) + (list extra-cmake-modules gettext-minimal)) (inputs - (list ;;TODO: ("kaccounts" ,kaccounts) - kconfig - kcoreaddons - knotifications - ki18n - kio - kirigami - qtbase-5 - qtdeclarative-5)) + (list + ;;TODO: kaccounts + kconfig + kcoreaddons + knotifications + ki18n + kio + kirigami + kwidgetsaddons + kitemviews + kcompletion + kservice + qtbase + qtdeclarative + prison)) (arguments (list #:tests? #f ;; seem to require network; don't find QTQuick components #:configure-flags #~'("-DBUILD_TESTING=OFF"))) ; not run anyway @@ -3558,29 +5199,41 @@ components so that all the plugins can receive all the information they need.") (license license:lgpl2.1+))) -;; This version of kdbusaddons does not use kinit as an input, and is used to -;; build kinit-bootstrap, as well as bootstrap versions of all kinit -;; dependencies which also rely on kdbusaddons. -(define kdbusaddons-bootstrap +(define-public purpose-5 (package - (inherit kdbusaddons) + (inherit purpose) + (name "purpose") + (version "5.116.0") (source (origin - (inherit (package-source kdbusaddons)) - (patches '()))) - (inputs (modify-inputs (package-inputs kdbusaddons) (delete "kinit"))) + (method url-fetch) + (uri (string-append + "mirror://kde/stable/frameworks/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1g0xip1khclinx3vb835krdsj66jllgbx1fka8d9f55n68d6rmk2")))) + (native-inputs + (list extra-cmake-modules)) + (inputs + (list + kconfig-5 + kcoreaddons-5 + knotifications-5 + ki18n-5 + kio-5 + kirigami-5 + qtbase-5 + qtdeclarative-5)) (arguments - (substitute-keyword-arguments (package-arguments kdbusaddons) - ((#:phases phases) - #~(modify-phases #$phases - (delete 'patch-source))))))) - -(define kinit-bootstrap - ((package-input-rewriting `((,kdbusaddons . ,kdbusaddons-bootstrap))) kinit)) + (list #:tests? #f ;; seem to require network; don't find QTQuick components + ;; not run anyway + #:configure-flags #~'("-DBUILD_TESTING=OFF"))))) (define-public ktextaddons (package (name "ktextaddons") - (version "1.5.3") + (version "1.5.4") (source (origin (method url-fetch) @@ -3588,10 +5241,12 @@ need.") "mirror://kde/stable/" name "/" name "-" version ".tar.xz")) (sha256 (base32 - "1p0p17dnh96zmzfb91wri7bryr90pvwb07r95n6xdad8py5dnlla")))) + "083v4x5f46h609g8zar6x22mp1ps85ikzbr08qbfj9abx010df34")))) (build-system qt-build-system) (arguments - (list #:phases + (list #:qtbase qtbase + #:configure-flags #~(list "-DQT_MAJOR_VERSION=6") + #:phases #~(modify-phases %standard-phases (replace 'check (lambda _ @@ -3603,7 +5258,7 @@ need.") "(grammalecteresultwidgettest|grammalecteconfigwidgettest||grammalecteresultjobtest|languagetoolconfigwidgettest|translator-translatorwidgettest|translator-translatorengineloadertest)")))))) (native-inputs (list extra-cmake-modules - qttools-5)) + qttools)) (inputs (list karchive kconfigwidgets @@ -3612,8 +5267,7 @@ need.") kio ksyntaxhighlighting kxmlgui - qtbase-5 - qtkeychain + qtkeychain-qt6 sonnet)) (home-page "https://community.kde.org/Frameworks") (synopsis "Various text handling addons") @@ -3634,7 +5288,7 @@ applications.") (define-public kde-frameworkintegration (package (name "kde-frameworkintegration") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) (uri (string-append @@ -3643,12 +5297,13 @@ applications.") "frameworkintegration-" version ".tar.xz")) (sha256 (base32 - "1dqgzhhh8gnvl8jsvh2i6pjn935d61avh63b4z9kpllhvp9a2lnd")))) + "0zscmn1hvv0y7j5r22r6cdmqznkv7h0s6v7a4wmpjgrpnd8haw4l")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules pkg-config)) - ;; TODO: Optional packages not yet in Guix: packagekitqt5, AppStreamQt - (inputs (list kconfig + (inputs (list packagekit-qt6 + appstream-qt6 + kconfig kconfigwidgets kcoreaddons ki18n @@ -3658,18 +5313,17 @@ applications.") knotifications kpackage kwidgetsaddons - qtbase-5 - qtx11extras)) + qtbase)) (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'check 'check-setup - (lambda _ - (setenv "HOME" (getcwd)) - ;; Make Qt render "offscreen", required for tests - (setenv "QT_QPA_PLATFORM" "offscreen")))))) + (list #:phases + #~(modify-phases %standard-phases + (add-before 'check 'check-setup + (lambda _ + (setenv "HOME" (getcwd)) + ;; Make Qt render "offscreen", required for tests + (setenv "QT_QPA_PLATFORM" "offscreen")))))) (home-page "https://community.kde.org/Frameworks") - (synopsis "KDE Frameworks 5 workspace and cross-framework integration plugins") + (synopsis "KDE Frameworks 6 workspace and cross-framework integration plugins") (description "Framework Integration is a set of plugins responsible for better integration of Qt applications when running on a KDE Plasma workspace.") @@ -3813,7 +5467,7 @@ http://community.kde.org/Frameworks/Porting_Notes should help with this.") (define-public khtml (package (name "khtml") - (version "5.114.0") + (version "5.116.0") (source (origin (method url-fetch) @@ -3822,34 +5476,34 @@ http://community.kde.org/Frameworks/Porting_Notes should help with this.") (version-major+minor version) "/portingAids/" name "-" version ".tar.xz")) (sha256 - (base32 "1mf84zs9hjvmi74f8rgqzrfkqjq597f9k64dn1bqcj13v0w10vry")))) + (base32 "13nc5dcj536xyd87prla30mpbzsyjnylb34a979qn7qvpr0zn8c9")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules perl)) (inputs (list giflib gperf - karchive - kcodecs - kglobalaccel - ki18n - kiconthemes - kio + karchive-5 + kcodecs-5 + kglobalaccel-5 + ki18n-5 + kiconthemes-5 + kio-5 kjs - knotifications - kparts - ktextwidgets - kwallet - kwidgetsaddons - kwindowsystem - kxmlgui + knotifications-5 + kparts-5 + ktextwidgets-5 + kwallet-5 + kwidgetsaddons-5 + kwindowsystem-5 + kxmlgui-5 libjpeg-turbo libpng openssl phonon qtbase-5 qtx11extras - sonnet)) + sonnet-5)) (home-page "https://community.kde.org/Frameworks") (synopsis "KDE Frameworks 5 HTML widget and component") (description "KHTML is a web rendering engine, based on the KParts @@ -3863,7 +5517,7 @@ technology and using KJS for JavaScript support.") (define-public kjs (package (name "kjs") - (version "5.114.0") + (version "5.116.0") (source (origin (method url-fetch) @@ -3872,7 +5526,7 @@ technology and using KJS for JavaScript support.") (version-major+minor version) "/portingAids/" name "-" version ".tar.xz")) (sha256 - (base32 "08nh6yr6bqifpb5s9a4wbjwmwnm7zp5k8hcdmyb6mlcbam9qp6j7")))) + (base32 "1dz1v5gizjywp452q98r4ka6iafa3b3c24ck8jv1xcym64zg7d4z")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules kdoctools perl pkg-config)) @@ -3889,112 +5543,10 @@ support.") license:bsd-2 license:bsd-3 (license:non-copyleft "file://src/kjs/dtoa.cpp"))))) -(define-public kjsembed - (package - (name "kjsembed") - (version "5.114.0") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://kde/stable/frameworks/" - (version-major+minor version) "/portingAids/" - name "-" version ".tar.xz")) - (sha256 - (base32 "1xglisxv7nfsbj9lgpvc4c5ql4f6m7n71vf7vih5ff3aqybrkgxa")))) - (build-system cmake-build-system) - (native-inputs - (list extra-cmake-modules kdoctools qttools-5)) - (inputs - (list ki18n kjs qtbase-5 qtsvg-5)) - (home-page "https://community.kde.org/Frameworks") - (synopsis "KDE Frameworks 5 embedded Javascript engine for Qt") - (description "KJSEmbed provides a method of binding Javascript objects to -QObjects, so you can script your applications.") - (license license:lgpl2.1+))) - -(define-public kmediaplayer - (package - (name "kmediaplayer") - (version "5.114.0") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://kde/stable/frameworks/" - (version-major+minor version) "/portingAids/" - name "-" version ".tar.xz")) - (sha256 - (base32 "092yvzvrkvr8xxncw7h5ghfd2bggzxsqfj67c2vhymhfw4i0c54x")))) - (build-system qt-build-system) - (native-inputs - (list extra-cmake-modules kdoctools qttools-5)) - (inputs - (list kcompletion - kcoreaddons - ki18n - kiconthemes - kio - kparts - kwidgetsaddons - kxmlgui - qtbase-5)) - (home-page "https://community.kde.org/Frameworks") - (synopsis "KDE Frameworks 5 plugin interface for media player features") - (description "KMediaPlayer builds on the KParts framework to provide a -common interface for KParts that can play media files. - -This framework is a porting aid. It is not recommended for new projects, and -existing projects that use it are advised to port away from it, and use plain -KParts instead.") - (license license:expat))) - -(define-public kross - (package - (name "kross") - (version "5.114.0") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://kde/stable/frameworks/" - (version-major+minor version) "/portingAids/" - name "-" version ".tar.xz")) - (sha256 - (base32 "0bbpi63lxbb4ylx2jd172a2bqyxkd606n7w8zrvcjy466lkv3sz4")))) - (build-system cmake-build-system) - (native-inputs - (list extra-cmake-modules kdoctools qttools-5)) - (inputs - (list kcompletion - kcoreaddons - ki18n - kiconthemes - kparts - kwidgetsaddons - kxmlgui - qtbase-5 - qtscript)) - (home-page "https://community.kde.org/Frameworks") - (synopsis "KDE Frameworks 5 solution for application scripting") - (description "Kross is a scripting bridge for the KDE Development Platform -used to embed scripting functionality into an application. It supports -QtScript as a scripting interpreter backend. - -Kross provides an abstract API to provide scripting functionality in a -interpreter-independent way. The application that uses Kross should not need -to know anything about the scripting language being used. The core of Kross -provides the framework to deal transparently with interpreter-backends and -offers abstract functionality to deal with scripts.") - ;; Most files are distributed under LGPL2+, but the package includes code - ;; under a variety of licenses. - (license (list license:lgpl2.0+ license:lgpl2.1+ - license:lgpl2.0 license:gpl3+)))) - (define-public kdav (package (name "kdav") - (version "5.114.0") + (version "6.3.0") (source (origin (method url-fetch) @@ -4002,20 +5554,23 @@ offers abstract functionality to deal with scripts.") (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 - (base32 "11959fxz24snk2l31kw8w96wah0s2fjimimrxh6xhppiy5qp2fp2")))) + (base32 "1f99nw6jsrka5hpp4ad13mgwprmzivv2h46vg2arjlr5x0csk4mh")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) + (propagated-inputs (list kcoreaddons)) (inputs - (list kcoreaddons ki18n kio qtbase-5 qtxmlpatterns)) + (list ki18n kio)) (arguments - (list #:phases #~(modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - ;; Seems to require network. - (invoke "ctest" "-E" - "(kdav-davcollectionsmultifetchjobtest|\ + (list + #:qtbase qtbase + #:phases #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + ;; Seems to require network. + (invoke "ctest" "-E" + "(kdav-davcollectionsmultifetchjobtest|\ kdav-davitemfetchjob)"))))))) (home-page "https://invent.kde.org/frameworks/kdav") (synopsis "DAV protocol implementation with KJobs") diff --git a/gnu/packages/kde-games.scm b/gnu/packages/kde-games.scm index e40fb3bef8..10c26e1d8e 100644 --- a/gnu/packages/kde-games.scm +++ b/gnu/packages/kde-games.scm @@ -45,15 +45,16 @@ (define-public ktuberling (package (name "ktuberling") - (version "23.04.3") + (version "24.05.2") (source (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/release-service/" version - "/src/ktuberling-" version ".tar.xz")) - (sha256 - (base32 "0zk7wijp425657s2j7xq7mhybgyddpam88ih8i0sbpcs0sliyz7k")))) + (method url-fetch) + (uri (string-append "mirror://kde/stable/release-service/" version + "/src/ktuberling-" version ".tar.xz")) + (sha256 + (base32 "15fizh4f1y6j475c91myw87fg8h5d0wi79niby19wgwwbhphzb2r")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules kdoctools perl)) (inputs @@ -67,11 +68,10 @@ kwidgetsaddons kxmlgui libkdegames - python-wrapper - qtbase-5 - qtmultimedia-5 - qtdeclarative-5 - qtsvg-5)) + ;python-wrapper + qtmultimedia + qtdeclarative + qtsvg)) (home-page "https://apps.kde.org/ktuberling/") (synopsis "Stamp drawing toy") (description "KTuberling is a drawing toy intended for small children and @@ -94,15 +94,16 @@ This package is part of the KDE games module.") (define-public picmi (package (name "picmi") - (version "23.04.3") + (version "24.05.2") (source (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/release-service/" version - "/src/picmi-" version ".tar.xz")) - (sha256 - (base32 "1x1iv6a840jwldfpx44wvh1vki1jz1hixzvzhdfx2mhw05v91fjx")))) + (method url-fetch) + (uri (string-append "mirror://kde/stable/release-service/" version + "/src/picmi-" version ".tar.xz")) + (sha256 + (base32 "0xx3bwib7p1g0xzykpsln07606rms8awrh1myr46lx65r1xffw05")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -115,9 +116,8 @@ This package is part of the KDE games module.") knewstuff kxmlgui libkdegames - qtbase-5 - qtdeclarative-5 - qtsvg-5)) + qtdeclarative + qtsvg)) (home-page "https://apps.kde.org/picmi/") (synopsis "Number logic game") (description "Picmi is a number logic game in which cells in a grid have @@ -130,15 +130,16 @@ This package is part of the KDE games module.") (define-public kolf (package (name "kolf") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kolf-" version ".tar.xz")) (sha256 - (base32 "0wbdpclc6nimjzs2pqbzaxnqn516hci1yk1dgig0jgdy1jv2nyhv")))) + (base32 "0i0rh3dw90j8p46dhfmmcl6nah080ilmhy9d1m9jwlb6xd03zg66")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -153,8 +154,7 @@ This package is part of the KDE games module.") kxmlgui ktextwidgets libkdegames - qtbase-5 - qtdeclarative-5)) + qtdeclarative)) (home-page "https://apps.kde.org/kolf/") (synopsis "Miniature golf game") (description "Kolf is a miniature golf game for one to ten players. The @@ -177,17 +177,18 @@ This package is part of the KDE games module.") (define-public libkmahjongg (package (name "libkmahjongg") - (version "23.04.3") + (version "24.05.2") (source (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/release-service/" - version "/src/libkmahjongg-" version ".tar.xz")) - (sha256 - (base32 "1a0c0q34h5yxwx76y6934ibn6hm1ip1hc2xvl11q1kaazq0alca3")))) + (method url-fetch) + (uri (string-append "mirror://kde/stable/release-service/" + version "/src/libkmahjongg-" version ".tar.xz")) + (sha256 + (base32 "1bjsrnkwkv4w94q5q4nhfy11jfrvxsl2v2kjv6dcm47z0k9y9v63")))) (build-system qt-build-system) (arguments (list + #:qtbase qtbase #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch-tileset-dir @@ -195,13 +196,13 @@ This package is part of the KDE games module.") ;; Add "$out/share" to XDG_DATA_DIRS so that the default tileset ;; is always available. (substitute* "src/kmahjonggtileset.cpp" - (("_inited = true;") + (("d->buildElementIdTable\\(\\);") (format #f "QByteArray x = qgetenv(\"XDG_DATA_DIRS\"); if (!x.isEmpty()) { QString datadirs = QString::fromLocal8Bit(x) + QLatin1String(\":~a\"); qputenv(\"XDG_DATA_DIRS\", datadirs.toLocal8Bit()); } -_inited = true;" +d->buildElementIdTable();" (string-append (assoc-ref outputs "out") "/share"))))))))) (native-inputs @@ -209,14 +210,12 @@ _inited = true;" (inputs (list kauth kcompletion - ;("kconfig" ,kconfig) kcodecs kconfigwidgets kcoreaddons ki18n kwidgetsaddons - qtbase-5 - qtsvg-5)) + qtsvg)) (home-page "https://games.kde.org/") (synopsis "Shared library for kmahjongg and kshisen") (description "Shared library and common files for kmahjongg, kshisen and @@ -226,14 +225,14 @@ other Mah Jongg like games.") (define-public kmahjongg (package (name "kmahjongg") - (version "23.04.3") + (version "24.05.2") (source (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/release-service/" - version "/src/kmahjongg-" version ".tar.xz")) - (sha256 - (base32 "1q2aq8y3c4a84rjvqk4gz6mlyflfnzw6im68p96wmcn98s5gsc22")))) + (method url-fetch) + (uri (string-append "mirror://kde/stable/release-service/" + version "/src/kmahjongg-" version ".tar.xz")) + (sha256 + (base32 "07x3rxxhg3z538bbwqi75mv1z546gvzssav43xzgyga3zg7179b6")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules kdoctools)) @@ -247,9 +246,9 @@ other Mah Jongg like games.") kxmlgui libkdegames libkmahjongg - qtbase-5 - qtdeclarative-5 - qtsvg-5)) + qtdeclarative + qtsvg)) + (arguments (list #:qtbase qtbase)) (home-page "https://apps.kde.org/kmahjongg/") (synopsis "Tile laying patience") (description "In KMahjongg the tiles are scrambled and staked on top of @@ -265,19 +264,17 @@ This package is part of the KDE games module.") (define-public kshisen (package (name "kshisen") - (version "23.04.3") + (version "24.05.2") (source (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/release-service/" - version "/src/kshisen-" version ".tar.xz")) - (sha256 - (base32 "0bfk6nbwl35sfqxhf7cdv3n61ybi5962i2lvg7m1vlpp21q0diz8")))) + (method url-fetch) + (uri (string-append "mirror://kde/stable/release-service/" + version "/src/kshisen-" version ".tar.xz")) + (sha256 + (base32 "1bx28jlvmwfh5rrvwd2kiq1c5r83s9lr49kl3x1rm5w7w5hlxyf1")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules - ;("perl" ,perl) - ;("pkg-config" ,pkg-config) kdoctools)) (inputs (list kauth @@ -290,8 +287,8 @@ This package is part of the KDE games module.") kxmlgui libkdegames libkmahjongg - qtbase-5 - qtdeclarative-5)) + qtdeclarative)) + (arguments (list #:qtbase qtbase)) (home-page "https://apps.kde.org/kshisen/") (synopsis "Shisen-Sho solitaire game") (description "KShisen is a solitaire-like game played using the standard @@ -304,44 +301,45 @@ This package is part of the KDE games module.") (define-public kajongg (package (name "kajongg") - (version "23.04.3") + (version "24.05.2") (source (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/release-service/" - version "/src/kajongg-" version ".tar.xz")) - (sha256 - (base32 "16v87x0qikfk9jpp8dfxnb7mnjzzi0qlkp5lbn2xypkfhqaz99fi")))) + (method url-fetch) + (uri (string-append "mirror://kde/stable/release-service/" + version "/src/kajongg-" version ".tar.xz")) + (sha256 + (base32 "0xwnin738zj6kh607asmwdq7n6jva9wk240c9rc53ja98nw4crpv")))) (build-system qt-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-paths - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "src/mjresource.py" - (("'share', 'kmahjongglib'" all) - (string-append "'" (assoc-ref inputs "libkmahjongg") - "/share', 'kmahjongglib'"))) - (substitute* "src/sound.py" - (("oggBinary = 'ogg123'") - (format #f "oggBinary = '~a'" - (search-input-file inputs "bin/ogg123")))) - (substitute* "src/common.py" - (("interpreterName = 'python3'") - (format #f "interpreterName = '~a'" - (search-input-file inputs "bin/python3")))))) - (add-after 'qt-wrap 'wrap - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (for-each (lambda (program) - (wrap-program program - `("GUIX_PYTHONPATH" ":" prefix - (,(getenv "GUIX_PYTHONPATH"))))) - (list (string-append out "/bin/kajongg") - (string-append out "/bin/kajonggserver"))))))))) + (list + #:qtbase qtbase + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/mjresource.py" + (("'share', 'kmahjongglib'" all) + (string-append "'" (assoc-ref inputs "libkmahjongg") + "/share', 'kmahjongglib'"))) + (substitute* "src/sound.py" + (("oggBinary = 'ogg123'") + (format #f "oggBinary = '~a'" + (search-input-file inputs "bin/ogg123")))) + (substitute* "src/common.py" + (("interpreterName = 'python3'") + (format #f "interpreterName = '~a'" + (search-input-file inputs "bin/python3")))))) + (add-after 'qt-wrap 'wrap + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (for-each (lambda (program) + (wrap-program program + `("GUIX_PYTHONPATH" ":" prefix + (,(getenv "GUIX_PYTHONPATH"))))) + (list (string-append out "/bin/kajongg") + (string-append out "/bin/kajonggserver"))))))))) (native-inputs (list extra-cmake-modules - ;("perl" ,perl) kdoctools)) (inputs (list bash-minimal @@ -355,8 +353,7 @@ This package is part of the KDE games module.") python-twisted python-qtpy python-zope-interface - qtbase-5 - qtsvg-5 + qtsvg vorbis-tools)) (home-page "https://apps.kde.org/kajongg/") (synopsis "Classical Mah Jongg game for 4 players") @@ -376,15 +373,16 @@ This package is part of the KDE games module.") (define-public kbreakout (package (name "kbreakout") - (version "23.04.3") + (version "24.05.2") (source (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/release-service/" version - "/src/kbreakout-" version ".tar.xz")) - (sha256 - (base32 "08fq0s1c71ag6jzyxz6spc5ylmzpbqpyqi9lqjk0x7y7brkfk9fq")))) + (method url-fetch) + (uri (string-append "mirror://kde/stable/release-service/" version + "/src/kbreakout-" version ".tar.xz")) + (sha256 + (base32 "0qnsvmhil1ybs94g533r26sqrfkqb06jh6gk4siqdd32dyyn7x3q")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -398,8 +396,7 @@ This package is part of the KDE games module.") kwidgetsaddons kxmlgui libkdegames - qtbase-5 - qtdeclarative-5)) + qtdeclarative)) (home-page "https://apps.kde.org/kbreakout/") (synopsis "Breakout like game") (description "KBreakout is similar to the classics breakout and xboing, @@ -413,15 +410,16 @@ This package is part of the KDE games module.") (define-public kmines (package (name "kmines") - (version "23.04.3") + (version "24.05.2") (source (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/release-service/" version - "/src/kmines-" version ".tar.xz")) - (sha256 - (base32 "0x301dsppn0sav31ds5hpbfkbbisjg640ri13103s1jn0y2b90b9")))) + (method url-fetch) + (uri (string-append "mirror://kde/stable/release-service/" version + "/src/kmines-" version ".tar.xz")) + (sha256 + (base32 "1ng0bda7q2ha7kmr83rlf9z24pkf14id5w6jzzgjw2yc21mbnwhm")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -436,8 +434,7 @@ This package is part of the KDE games module.") kwidgetsaddons kxmlgui libkdegames - qtbase-5 - qtdeclarative-5)) + qtdeclarative)) (home-page "https://apps.kde.org/kmines/") (synopsis "Classical mine sweeper game") (description "KMines is a classic Minesweeper game. The idea is to @@ -450,15 +447,16 @@ This package is part of the KDE games module.") (define-public konquest (package (name "konquest") - (version "23.04.3") + (version "24.05.2") (source (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/release-service/" - version "/src/konquest-" version ".tar.xz")) - (sha256 - (base32 "0svzaibs8v1xd36ysj3wk7sxma26fl5pz6yp774jg0g9zi9rlkff")))) + (method url-fetch) + (uri (string-append "mirror://kde/stable/release-service/" + version "/src/konquest-" version ".tar.xz")) + (sha256 + (base32 "0bykh3ihigvzaxkzhk801hfr28frxq4hkwixicapzdfamhc22w95")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -472,9 +470,9 @@ This package is part of the KDE games module.") kwidgetsaddons kxmlgui libkdegames - qtbase-5 - qtdeclarative-5 - qtsvg-5)) + qtscxml + qtdeclarative + qtsvg)) (home-page "https://apps.kde.org/konquest/") (synopsis "Simple turn-based strategy game") (description "Konquest is the KDE version of Gnu-Lactic Konquest. Players @@ -489,15 +487,16 @@ This package is part of the KDE games module.") (define-public kbounce (package (name "kbounce") - (version "23.04.3") + (version "24.05.2") (source (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/release-service/" - version "/src/kbounce-" version ".tar.xz")) - (sha256 - (base32 "06b0q4f4yn8m8gy7wgax54ldwnkgykr8yfr2h0ih8mfg3w8xsx7s")))) + (method url-fetch) + (uri (string-append "mirror://kde/stable/release-service/" + version "/src/kbounce-" version ".tar.xz")) + (sha256 + (base32 "0s9009qi40fdi24lwp789cydgy1rm0n9f0fsb8pbldi9rmdk9x60")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -511,9 +510,8 @@ This package is part of the KDE games module.") kwidgetsaddons kxmlgui libkdegames - qtbase-5 - qtdeclarative-5 - qtsvg-5)) + qtdeclarative + qtsvg)) (home-page "https://apps.kde.org/kbounce/") (synopsis "Jezzball arcade game") (description "KBounce is a single player arcade game with the elements of @@ -527,15 +525,16 @@ This package is part of the KDE games module.") (define-public kblocks (package (name "kblocks") - (version "23.04.3") + (version "24.05.2") (source (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/release-service/" - version "/src/kblocks-" version ".tar.xz")) - (sha256 - (base32 "1z5f2zpnmfh05vlmjw85jj2d0sfxl5w1kg30ky6gmgmmfzj2sjzx")))) + (method url-fetch) + (uri (string-append "mirror://kde/stable/release-service/" + version "/src/kblocks-" version ".tar.xz")) + (sha256 + (base32 "05l2g21rzpln7kzywgraplqymgfdk1wvr1jfm3ffk0nzdyi0fy08")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -549,9 +548,8 @@ This package is part of the KDE games module.") kwidgetsaddons kxmlgui libkdegames - qtbase-5 - qtdeclarative-5 - qtsvg-5)) + qtdeclarative + qtsvg)) (home-page "https://apps.kde.org/kblocks/") (synopsis "Single player falling blocks puzzle game") (description "KBlocks is the classic Tetris-like falling blocks game. @@ -567,15 +565,16 @@ This package is part of the KDE games module.") (define-public ksudoku (package (name "ksudoku") - (version "23.04.3") + (version "24.05.2") (source (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/release-service/" - version "/src/ksudoku-" version ".tar.xz")) - (sha256 - (base32 "03hrwyvwzhxdbq7pp03c7lkz0dhv9yi6lcwvz3s63mn01wyq6iv3")))) + (method url-fetch) + (uri (string-append "mirror://kde/stable/release-service/" + version "/src/ksudoku-" version ".tar.xz")) + (sha256 + (base32 "1hygl0m26ylj0gm9i8mm7cr2aclq27z8ammydhw824d1nwjw98b0")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -584,6 +583,7 @@ This package is part of the KDE games module.") kconfigwidgets kcoreaddons kcrash + kdbusaddons kguiaddons ki18n kiconthemes @@ -592,9 +592,8 @@ This package is part of the KDE games module.") kxmlgui libkdegames glu - qtbase-5 - qtdeclarative-5 - qtsvg-5)) + qtdeclarative + qtsvg)) (home-page "https://apps.kde.org/ksudoku/") (synopsis "Sudoku puzzle game and solver") (description "KSudoku is a Sudoku game and solver, supporting a range of @@ -627,15 +626,16 @@ This package is part of the KDE games module.") (define-public klines (package (name "klines") - (version "23.04.3") + (version "24.05.2") (source (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/release-service/" version - "/src/klines-" version ".tar.xz")) - (sha256 - (base32 "1dny7wsj90c3vbgbrpxvxfy44j9ip3vdylc7889ckzbliivipxk4")))) + (method url-fetch) + (uri (string-append "mirror://kde/stable/release-service/" version + "/src/klines-" version ".tar.xz")) + (sha256 + (base32 "1c6y071h2w1v3bn7cc5qy1l5m3s1s0vah72196y8gdh7bfx7kaxx")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -648,8 +648,7 @@ This package is part of the KDE games module.") kwidgetsaddons kxmlgui libkdegames - qtbase-5 - qtdeclarative-5)) + qtdeclarative)) (home-page "https://apps.kde.org/klines/") (synopsis "Place 5 equal pieces together, but wait, there are 3 new ones") (description "KLines is a simple but highly addictive one player game. @@ -670,15 +669,16 @@ This package is part of the KDE games module.") (define-public kgoldrunner (package (name "kgoldrunner") - (version "23.04.3") + (version "24.05.2") (source (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/release-service/" version - "/src/kgoldrunner-" version ".tar.xz")) - (sha256 - (base32 "0acavby9lwbqbx577a3az9lcahchngcs15571va2ndnq1r16paxf")))) + (method url-fetch) + (uri (string-append "mirror://kde/stable/release-service/" version + "/src/kgoldrunner-" version ".tar.xz")) + (sha256 + (base32 "10v280785ds03h6ra384hhck422dwy8zz57x4wpcq87azzf0mi4c")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -691,8 +691,8 @@ This package is part of the KDE games module.") kwidgetsaddons kxmlgui libkdegames - qtbase-5 - qtdeclarative-5)) + qtbase + qtdeclarative)) (home-page "https://apps.kde.org/kgoldrunner/") (synopsis "Action and puzzle solving game") (description "KGoldrunner is an action game where the hero runs through a @@ -710,15 +710,16 @@ This package is part of the KDE games module.") (define-public kdiamond (package (name "kdiamond") - (version "23.04.3") + (version "24.05.2") (source (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/release-service/" version - "/src/kdiamond-" version ".tar.xz")) - (sha256 - (base32 "038lpp387m45zcy49rgmisiz5ajrvxwxnf424wllrjkihxy1siyn")))) + (method url-fetch) + (uri (string-append "mirror://kde/stable/release-service/" version + "/src/kdiamond-" version ".tar.xz")) + (sha256 + (base32 "1ql8psh6lyahrdiqj0qji1dsyz8jl260msp76k804jk0477gjw8h")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -734,8 +735,7 @@ This package is part of the KDE games module.") kwidgetsaddons kxmlgui libkdegames - qtbase-5 - qtdeclarative-5)) + qtdeclarative)) (home-page "https://apps.kde.org/kdiamond/") (synopsis "Three-in-a-row game") (description "KDiamond is a three-in-a-row game like Bejeweled. It @@ -748,15 +748,16 @@ This package is part of the KDE games module.") (define-public kfourinline (package (name "kfourinline") - (version "23.04.3") + (version "24.05.2") (source (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/release-service/" version - "/src/kfourinline-" version ".tar.xz")) - (sha256 - (base32 "0chfjp0k4ps5f6vy8nxqc2xlj4xql08llxnzsz6c2x611n69aszm")))) + (method url-fetch) + (uri (string-append "mirror://kde/stable/release-service/" version + "/src/kfourinline-" version ".tar.xz")) + (sha256 + (base32 "15l1bvz3c7h3pv0inaq73haqhwh2v5gdqnxsrhi5ra6dw5nm0d8l")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -765,13 +766,13 @@ This package is part of the KDE games module.") kconfigwidgets kcoreaddons kcrash + kdbusaddons kdnssd ki18n kxmlgui libkdegames - qtbase-5 - qtdeclarative-5 - qtsvg-5)) + qtdeclarative + qtsvg)) (home-page "https://apps.kde.org/kfourinline/") (synopsis "Place 4 pieces in a row") (description "KFourInLine is a board game for two players based on the @@ -786,15 +787,16 @@ This package is part of the KDE games module.") (define-public kblackbox (package (name "kblackbox") - (version "23.04.3") + (version "24.05.2") (source (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/release-service/" version - "/src/kblackbox-" version ".tar.xz")) - (sha256 - (base32 "0h7byd7g52yvmz3gxrzp2frs4iifm0r6lq8fjz2nxbl1rkw9ljbp")))) + (method url-fetch) + (uri (string-append "mirror://kde/stable/release-service/" version + "/src/kblackbox-" version ".tar.xz")) + (sha256 + (base32 "0andcfwrq8nhb75diif3pm2a1y6lrmkdncaszjhyan1v9mycdi8r")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -808,9 +810,8 @@ This package is part of the KDE games module.") ktextwidgets kxmlgui libkdegames - qtbase-5 - qtdeclarative-5 - qtsvg-5)) + qtdeclarative + qtsvg)) (home-page "https://apps.kde.org/kblackbox/") (synopsis "Find atoms in a grid by shooting electrons") (description "KBlackbox is a game of hide and seek played on a grid of @@ -826,15 +827,16 @@ This package is part of the KDE games module.") (define-public knetwalk (package (name "knetwalk") - (version "23.04.3") + (version "24.05.2") (source (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/release-service/" version - "/src/knetwalk-" version ".tar.xz")) - (sha256 - (base32 "1xqqwsbm3f8bmid7afbnacxlg1hih644f0nw0i87pr746m1sskgz")))) + (method url-fetch) + (uri (string-append "mirror://kde/stable/release-service/" version + "/src/knetwalk-" version ".tar.xz")) + (sha256 + (base32 "1p6d27l2j6h5kqyjpws4s0ilvzhrhbd3lwd7776z1lmidqixvwfq")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -849,8 +851,7 @@ This package is part of the KDE games module.") kwidgetsaddons kxmlgui libkdegames - qtbase-5 - qtdeclarative-5)) + qtdeclarative)) (home-page "https://apps.kde.org/knetwalk/") (synopsis "Turn the board pieces to get all computers connected") (description "KNetWalk is a small game where you have to build up a @@ -867,14 +868,14 @@ This package is part of the KDE games module.") (define-public bomber (package (name "bomber") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/bomber-" version ".tar.xz")) (sha256 - (base32 "0qgixhmlkcjni5i9391hjg3sfc3ps24lmk9v8199lmnplrybklqj")))) + (base32 "1sw3a2nvwciq7m8d30k0ipzx5gsa48jwflxkih8ha354wl5mk1cs")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules kdoctools)) @@ -887,8 +888,8 @@ This package is part of the KDE games module.") ki18n kxmlgui libkdegames - qtbase-5 - qtdeclarative-5)) + qtdeclarative)) + (arguments (list #:qtbase qtbase)) (home-page "https://apps.kde.org/bomber/") (synopsis "Arcade bombing game") (description "Bomber is a single player arcade game. @@ -908,14 +909,14 @@ This package is part of the KDE games module.") (define-public granatier (package (name "granatier") - (version "23.04.3") + (version "24.05.2") (source (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/release-service/" version - "/src/granatier-" version ".tar.xz")) - (sha256 - (base32 "1zyadmgnpgsx728gzd55qyijsm13pb9cxs1y4l4c4m9lnz4y183v")))) + (method url-fetch) + (uri (string-append "mirror://kde/stable/release-service/" version + "/src/granatier-" version ".tar.xz")) + (sha256 + (base32 "0g38sfx4x61isvi3h6b8xmdbbqrvq8z8rrxb0xdbz3fkwxyigy75")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules kdoctools)) @@ -931,9 +932,9 @@ This package is part of the KDE games module.") kwidgetsaddons kxmlgui libkdegames - qtbase-5 - qtdeclarative-5 - qtsvg-5)) + qtdeclarative + qtsvg)) + (arguments (list #:qtbase qtbase)) (home-page "https://apps.kde.org/granatier/") (synopsis "Bomberman clone") (description "Granatier is a clone of the classic Bomberman game, @@ -945,19 +946,20 @@ This package is part of the KDE games module.") (define-public ksirk (package (name "ksirk") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version - "/src/ksirk-" version ".tar.xz")) + "/src/ksirk-" version ".tar.xz")) (sha256 - (base32 "1sp5mhnf8r3fvifz0kw74436j5kwsmiw66myygb4rsggb8amh5x4")))) + (base32 "0ki9z8p4flrs7msihya8ykxs3p4w10v3ivmgf43ldygjjndyhql9")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules kdoctools)) (inputs (list kcrash + kdbusaddons ki18n kiconthemes kio @@ -966,11 +968,13 @@ This package is part of the KDE games module.") kxmlgui libkdegames phonon - qca - qtbase-5 - qtdeclarative-5 - qtsvg-5 + qca-qt6 + qt5compat + qtdeclarative + qtmultimedia + qtsvg zlib)) + (arguments (list #:qtbase qtbase)) (home-page "https://apps.kde.org/ksirk/") (synopsis "Computerized version of the well known strategy board game 'Risk'") @@ -1000,14 +1004,14 @@ This package is part of the KDE games module.") (define-public palapeli (package (name "palapeli") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/palapeli-" version ".tar.xz")) (sha256 - (base32 "19xh03rhb48m4bbdmpga4aqij6agqg047ghl92p98z1phg5lxzrv")))) + (base32 "1436rbfrppjb73k8p9amzwa6hhjns3hjli279r8fqscjimil0vv4")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules kdoctools)) @@ -1018,8 +1022,7 @@ This package is part of the KDE games module.") kconfigwidgets kcoreaddons kcrash - kcrash - ki18n + kdbusaddons ki18n kio kitemviews @@ -1028,10 +1031,10 @@ This package is part of the KDE games module.") kwidgetsaddons kxmlgui libkdegames - qtbase-5 - qtdeclarative-5 - qtsvg-5 + qtdeclarative + qtsvg shared-mime-info)) + (arguments (list #:qtbase qtbase)) (home-page "https://apps.kde.org/palapeli/") (synopsis "Jigsaw puzzle game") (description "Palapeli is a jigsaw puzzle game. Unlike other games in @@ -1047,14 +1050,14 @@ This package is part of the KDE games module.") (define-public kiriki (package (name "kiriki") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kiriki-" version ".tar.xz")) (sha256 - (base32 "13lzpbhkp48r9m0bcrzfqacz9xvc89xavf3yn3ql50g3jjlkq41v")))) + (base32 "0gysvh9afr1zhjv5d5kan6m6b8b45jd1p3f2kssiql84m5xv7jsy")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules kdoctools)) @@ -1069,8 +1072,8 @@ This package is part of the KDE games module.") kiconthemes kxmlgui libkdegames - qtbase-5 - qtdeclarative-5)) + qtdeclarative)) + (arguments (list #:qtbase qtbase)) (home-page "https://apps.kde.org/kiriki/") (synopsis "Yahtzee dice game") (description "Kiriki is an addictive and fun dice game, designed to be @@ -1085,14 +1088,14 @@ This package is part of the KDE games module.") (define-public kigo (package (name "kigo") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kigo-" version ".tar.xz")) (sha256 - (base32 "0qx9plrs588210rdgvb2bkm5yjw4pna9q7v38cb166nfgkh6gv63")))) + (base32 "18jdv0dwxysf3i3c8d663x95h1pbkbvlw860lqgapdx9cnybqz1a")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules kdoctools)) @@ -1108,9 +1111,9 @@ This package is part of the KDE games module.") ktextwidgets kxmlgui libkdegames - qtbase-5 - qtdeclarative-5 - qtsvg-5)) + qtdeclarative + qtsvg)) + (arguments (list #:qtbase qtbase)) (home-page "https://apps.kde.org/kigo/") (synopsis "Go board game") (description "Kigo is an open-source implementation of the popular Go @@ -1131,14 +1134,14 @@ This package is part of the KDE games module.") (define-public kubrick (package (name "kubrick") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kubrick-" version ".tar.xz")) (sha256 - (base32 "0nank1ga4c4xfsw0m1cqhjhyz2wpbsxplyyb9x3l2vpg92gj5dbs")))) + (base32 "05mcrjbf6gm7dldww3iqhhrknzf59xj8fw4rzbb6l79rrvp1vrvz")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules kdoctools)) @@ -1148,14 +1151,16 @@ This package is part of the KDE games module.") kconfigwidgets kcoreaddons kcrash + kdbusaddons ki18n kio kwidgetsaddons kxmlgui libkdegames - qtbase-5 - qtdeclarative-5 - qtsvg-5)) + qtbase + qtdeclarative + qtsvg)) + (arguments (list #:qtbase qtbase)) (home-page "https://apps.kde.org/kubrick/") (synopsis "Game based on Rubik's Cube") (description "Kubrick is a game based on the Rubik's Cube puzzle. @@ -1172,14 +1177,14 @@ This package is part of the KDE games module.") (define-public lskat (package (name "lskat") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/lskat-" version ".tar.xz")) (sha256 - (base32 "1qphzc1r26qwc8sl5rjkw16ia3lsj7c2lg9fxnhk08k8mxncymxg")))) + (base32 "1p5gq8zkjr3cl7scq9irhiaf96az02k1fk3c0myqh0l9nyxakpsw")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules kdoctools)) @@ -1188,14 +1193,15 @@ This package is part of the KDE games module.") kconfig kcoreaddons kcrash + kdbusaddons kguiaddons ki18n kwidgetsaddons kxmlgui libkdegames - qtbase-5 - qtdeclarative-5 - qtsvg-5)) + qtdeclarative + qtsvg)) + (arguments (list #:qtbase qtbase)) (home-page "https://apps.kde.org/lskat/") (synopsis "Lieutnant Skat card game") (description "Lieutnant Skat (from German \"Offiziersskat\") is a fun and @@ -1210,14 +1216,14 @@ This package is part of the KDE games module.") (define-public kapman (package (name "kapman") - (version "23.04.3") + (version "24.05.2") (source (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/release-service/" version - "/src/kapman-" version ".tar.xz")) - (sha256 - (base32 "0ildsd7pig3lm9n616kw5mpl8hbwidsnbzdfifx8nnffslrr4bv7")))) + (method url-fetch) + (uri (string-append "mirror://kde/stable/release-service/" version + "/src/kapman-" version ".tar.xz")) + (sha256 + (base32 "1lwxrd8ky9bkrxjg42spyyywxv17lp5idm5xr4xybq3sqi2gahhx")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules kdoctools)) @@ -1231,9 +1237,9 @@ This package is part of the KDE games module.") ki18n kxmlgui libkdegames - qtbase-5 - qtdeclarative-5 - qtsvg-5)) + qtdeclarative + qtsvg)) + (arguments (list #:qtbase qtbase)) (home-page "https://apps.kde.org/kapman/") (synopsis "Pac-Man clone") (description "Kapman is a clone of the well known game Pac-Man. @@ -1249,14 +1255,14 @@ This package is part of the KDE games module.") (define-public kspaceduel (package (name "kspaceduel") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kspaceduel-" version ".tar.xz")) (sha256 - (base32 "1mpry73vvi332wxyw2wymh3lsrj2amblg50dym9ni1lj2af657ia")))) + (base32 "04sjx32b4jgz9hwjmfyjcxlrd6jwg355sr6knr8vdxhjg18k2wa0")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules kdoctools)) @@ -1270,9 +1276,9 @@ This package is part of the KDE games module.") ki18n kxmlgui libkdegames - qtbase-5 - qtdeclarative-5 - qtsvg-5)) + qtdeclarative + qtsvg)) + (arguments (list #:qtbase qtbase)) (home-page "https://apps.kde.org/kspaceduel/") (synopsis "Two player game with shooting spaceships flying around a sun") (description "KSpaceduel is a space battle game for one or two players, @@ -1284,14 +1290,14 @@ This package is part of the KDE games module.") (define-public bovo (package (name "bovo") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/bovo-" version ".tar.xz")) (sha256 - (base32 "1zds6d4rmcf4sa2sfhyp1i5n7s7cgslikvbra4pz2kpi0hmvihi1")))) + (base32 "0rcnc3v4p0xgkybk4csjwkd7mfiffhqfwx3c5yfwnnrh7rdrmh5j")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules kdoctools)) @@ -1303,9 +1309,9 @@ This package is part of the KDE games module.") ki18n kxmlgui libkdegames - qtbase-5 - qtdeclarative-5 - qtsvg-5)) + qtdeclarative + qtsvg)) + (arguments (list #:qtbase qtbase)) (home-page "https://apps.kde.org/bovo/") (synopsis "Classic pen and paper game: five in a line") (description "Bovo is a Gomoku (from Japanese 五目並べ - lit. \"five @@ -1320,15 +1326,16 @@ This package is part of the KDE games module.") (define-public killbots (package (name "killbots") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/killbots-" version ".tar.xz")) (sha256 - (base32 "0ygg2cmp7wqzw9nsn768vzgjs8i44k3skwcn2abg1jj5k64wp9cb")))) + (base32 "1vs4prhflmy6z9p3ab6r3qgzqn2vqv4abc0mhq04zbnh7sqcy0k7")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -1342,8 +1349,7 @@ This package is part of the KDE games module.") kwidgetsaddons kxmlgui libkdegames - qtbase-5 - qtdeclarative-5)) + qtdeclarative)) (home-page "https://apps.kde.org/killbots/") (synopsis "Port of the classic BSD console game robots") (description "Killbots is a simple game of evading killer robots. @@ -1361,15 +1367,16 @@ This package is part of the KDE games module.") (define-public ksnakeduel (package (name "ksnakeduel") - (version "23.04.3") + (version "24.05.2") (source (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/release-service/" version - "/src/ksnakeduel-" version ".tar.xz")) - (sha256 - (base32 "182z9664p0shyx4rbr1cn32mzlfzl80x96nwakvv1ss7sf7dp1x3")))) + (method url-fetch) + (uri (string-append "mirror://kde/stable/release-service/" version + "/src/ksnakeduel-" version ".tar.xz")) + (sha256 + (base32 "11v8zrbwb8dhdmaa76rhv5qa084raxldl8sjp9299hd8wk34297b")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -1383,9 +1390,8 @@ This package is part of the KDE games module.") ki18n kxmlgui libkdegames - qtbase-5 - qtdeclarative-5 - qtsvg-5)) + qtdeclarative + qtsvg)) (home-page "https://apps.kde.org/ksnakeduel/") (synopsis "Snake race played against the computer") (description "KSnakeDuel is a fast action game where you steer a snake @@ -1399,15 +1405,16 @@ This package is part of the KDE games module.") (define-public kollision (package (name "kollision") - (version "23.04.3") + (version "24.05.2") (source (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/release-service/" version - "/src/kollision-" version ".tar.xz")) - (sha256 - (base32 "0g9nz3df8nibcwlrjlyw306dnrx58nlga2lljn7a9acpmvbp6qgi")))) + (method url-fetch) + (uri (string-append "mirror://kde/stable/release-service/" version + "/src/kollision-" version ".tar.xz")) + (sha256 + (base32 "1fvhbvb72w5xgz6hyp795j07ngc78isbk4i9g0yfznl1z59hygs7")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -1420,8 +1427,7 @@ This package is part of the KDE games module.") kwidgetsaddons kxmlgui libkdegames - qtbase-5 - qtdeclarative-5)) + qtdeclarative)) (home-page "https://apps.kde.org/kollision/") (synopsis "Simple ball dodging game") (description "In Kollision you use mouse to control a small blue ball in a @@ -1436,15 +1442,16 @@ This package is part of the KDE games module.") (define-public knavalbattle (package (name "knavalbattle") - (version "23.04.3") + (version "24.05.2") (source (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/release-service/" version - "/src/knavalbattle-" version ".tar.xz")) - (sha256 - (base32 "1brj2dvymgpf74vbsrs2m81lxxfxsly9pafd13g8rkzdx3hn1n0q")))) + (method url-fetch) + (uri (string-append "mirror://kde/stable/release-service/" version + "/src/knavalbattle-" version ".tar.xz")) + (sha256 + (base32 "0smr35f76hhy7gzla6q2ly9ip01ly3v33xhqq9dqpp144bs4vkab")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -1460,8 +1467,7 @@ This package is part of the KDE games module.") ktextwidgets kxmlgui libkdegames - qtbase-5 - qtdeclarative-5)) + qtdeclarative)) (home-page "https://apps.kde.org/knavalbattle/") (synopsis "Battleship board game with built-in game server") (description "KBattleship is a Battle Ship game for KDE. @@ -1476,15 +1482,16 @@ This package is part of the KDE games module.") (define-public kreversi (package (name "kreversi") - (version "23.04.3") + (version "24.05.2") (source (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/release-service/" version - "/src/kreversi-" version ".tar.xz")) - (sha256 - (base32 "1mb1xrywk5p7ipjml1g2mjqfs7rlpa41if3yc7p9zcrkcasnbffv")))) + (method url-fetch) + (uri (string-append "mirror://kde/stable/release-service/" version + "/src/kreversi-" version ".tar.xz")) + (sha256 + (base32 "1vrh1kl2qh03826m5n3nvj5fn0jrakqvkrlc3jxr9hm26c2k26ah")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -1499,9 +1506,8 @@ This package is part of the KDE games module.") kio kxmlgui libkdegames - qtbase-5 - qtdeclarative-5 - qtsvg-5)) + qtdeclarative + qtsvg)) (home-page "https://apps.kde.org/kreversi/") (synopsis "Old reversi board game, also known as othello") (description "KReversi is a simple one player strategy game played @@ -1518,15 +1524,16 @@ This package is part of the KDE games module.") (define-public ksquares (package (name "ksquares") - (version "23.04.3") + (version "24.05.2") (source (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/release-service/" version - "/src/ksquares-" version ".tar.xz")) - (sha256 - (base32 "0b3r99hfhm5r4jxkwiji0lww703r7dj60x2m55ginvdy7ixm46rm")))) + (method url-fetch) + (uri (string-append "mirror://kde/stable/release-service/" version + "/src/ksquares-" version ".tar.xz")) + (sha256 + (base32 "1nmlnqirgp53h03kyj0cwg0nny0dckb6c7vs16jkqr11rmb39g1v")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -1540,8 +1547,7 @@ This package is part of the KDE games module.") kwidgetsaddons kxmlgui libkdegames - qtbase-5 - qtdeclarative-5)) + qtdeclarative)) (home-page "https://apps.kde.org/ksquares/") (synopsis "Dots and Boxes game") (description "KSquares is an implementation of the popular paper based @@ -1554,15 +1560,16 @@ This package is part of the KDE games module.") (define-public kjumpingcube (package (name "kjumpingcube") - (version "23.04.3") + (version "24.05.2") (source (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/release-service/" version - "/src/kjumpingcube-" version ".tar.xz")) - (sha256 - (base32 "09bh57vzjnn56dnhpp4szx72wyskc5g714vlyp6c27vr27xry8fi")))) + (method url-fetch) + (uri (string-append "mirror://kde/stable/release-service/" version + "/src/kjumpingcube-" version ".tar.xz")) + (sha256 + (base32 "1ihll2x7inc76752xwj3dfs2653i9c5prfllh2p8vfc1ss0raa34")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -1576,9 +1583,8 @@ This package is part of the KDE games module.") kwidgetsaddons kxmlgui libkdegames - qtbase-5 - qtdeclarative-5 - qtsvg-5)) + qtdeclarative + qtsvg)) (home-page "https://apps.kde.org/kjumpingcube/") (synopsis "Simple tactical game for number-crunchers") (description "KJumpingcube is a simple tactical game for one or two @@ -1591,7 +1597,7 @@ This package is part of the KDE games module.") (define-public kde-games (package (name "kde-games") - (version "23.04.3") + (version "24.05.2") (source #f) (build-system trivial-build-system) (arguments diff --git a/gnu/packages/kde-internet.scm b/gnu/packages/kde-internet.scm index b9d3502b09..86e30750c9 100644 --- a/gnu/packages/kde-internet.scm +++ b/gnu/packages/kde-internet.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2022 Brendan Tildesley <mail@brendan.scot> ;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com> +;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -69,32 +70,32 @@ (base32 "0zm4nkpmvd181xlkis7ydzx54p3vn0zgpdzgh54f1hsjy6ahsq16")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules kdoctools pkg-config)) + (list extra-cmake-modules kdoctools-5 pkg-config)) (inputs - (list attica - kcmutils - kconfigwidgets - kcoreaddons + (list attica-5 + kcmutils-5 + kconfigwidgets-5 + kcoreaddons-5 kemoticons - kglobalaccel - kguiaddons - ki18n - kio - knotifications - knotifyconfig - kparts - ktextwidgets - kwallet - kwidgetsaddons - kxmlgui + kglobalaccel-5 + kguiaddons-5 + ki18n-5 + kio-5 + knotifications-5 + knotifyconfig-5 + kparts-5 + ktextwidgets-5 + kwallet-5 + kwidgetsaddons-5 + kxmlgui-5 ;; TODO: telepathy breeze-icons ; default icon set - purpose + purpose-5 qca qoauth qtbase-5 qtnetworkauth-5 - sonnet)) + sonnet-5)) (home-page "https://kde.org/applications/internet/org.kde.choqok") (synopsis "Micro-Blogging Client") (description "Choqok is a fast, efficient and simple to use micro-blogging @@ -118,7 +119,7 @@ Other notable features include: (define-public falkon (package (name "falkon") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) @@ -126,18 +127,23 @@ Other notable features include: "/src/falkon-" version ".tar.xz")) (sha256 (base32 - "11r1iwimdzabfah68gsvw6xi67cj539anqa6s1rg33agsi5y56d3")))) + "0j930i2nvg71p05z881inbk59c54gx8dzhyjb8iaqkw8i5s5r983")))) (build-system qt-build-system) (arguments (list #:phases #~(modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "ctest" "-E" - "(locationbartest|qmltabsapitest)"))))))) + (add-after 'install 'wrap + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((qtwebengineprocess + (search-input-file inputs + "lib/qt6/libexec/QtWebEngineProcess"))) + ;; The program fails to find the QtWebEngineProcess program, so + ;; we set QTWEBENGINEPROCESS_PATH to help it. + (wrap-program (string-append #$output "/bin/falkon") + `("QTWEBENGINEPROCESS_PATH" = + (,qtwebengineprocess))))))))) (native-inputs - (list extra-cmake-modules pkg-config qttools-5)) + (list extra-cmake-modules pkg-config qttools)) (inputs (list karchive kcoreaddons @@ -147,11 +153,10 @@ Other notable features include: kwallet openssl purpose - qtquickcontrols-5 - qtsvg-5 - qtwebengine-5 - qtx11extras - qtwayland-5 + qt5compat + qtsvg + qtwebengine + qtwayland xcb-util)) (home-page "https://www.falkon.org/") (synopsis "Qt-based web browser for KDE") @@ -162,21 +167,23 @@ Other notable features include: (define-public kget (package (name "kget") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kget-" version ".tar.xz")) (sha256 - (base32 "1n9wnm1si4g4rv8zaqpr8m3c2aav0mj8i7z96m78dk1apippx77r")))) + (base32 "0xm3a3bxk4gb1yxpq3icg1wh5sqpmxqlr9n8j1gffszzd6c9x8mn")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules kdoctools pkg-config)) (inputs (list boost gmp - gpgme + ;; TODO: enable when we qgpgme support qt6. + ;; gpgme + ;; qgpgme kcmutils kcompletion kconfig @@ -184,7 +191,6 @@ Other notable features include: kcoreaddons kcrash kdbusaddons - kdelibs4support ;; KLocale ki18n kiconthemes kio @@ -193,6 +199,7 @@ Other notable features include: knotifyconfig kparts kservice + kstatusnotifieritem ktextwidgets kwallet kwidgetsaddons @@ -200,20 +207,11 @@ Other notable features include: kxmlgui libgcrypt libktorrent - ;; TODO: libmms - ;; TODO: LibKWorkspace - plasma-workspace? + libmms breeze-icons ; default icon set - qca - qgpgme - qtbase-5)) + qca-qt6)) (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? ;; FIXME: two tests fails. - (invoke "ctest" "-E" "(schedulertest|filedeletertest)")) - #t))))) + (list #:qtbase qtbase)) (home-page "https://www.kde.org/") (synopsis "Versatile and user-friendly download manager") (description "KGet is an advanced download manager with support for @@ -228,17 +226,17 @@ This package is part of the KDE networking module.") (define-public konversation (package (name "konversation") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/konversation-" version ".tar.xz")) (sha256 - (base32 "1ip0jlz71fad5l0ppbc6w914hqk7h626s12ssbb9p1c2yvlr1j1v")))) + (base32 "1migcrl2d3i4iadijhpap0mm2cd7irp3g2962flll41mv5nhzwsl")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules kdoctools)) + (list extra-cmake-modules kdoctools qttools)) (inputs (list karchive kbookmarks @@ -247,7 +245,6 @@ This package is part of the KDE networking module.") kcoreaddons kcrash kdbusaddons - kemoticons kglobalaccel ki18n kiconthemes @@ -258,16 +255,19 @@ This package is part of the KDE networking module.") knotifications knotifyconfig kparts + kstatusnotifieritem + ktextwidgets kwallet kwidgetsaddons kwindowsystem breeze-icons ; default icon set phonon - qtbase-5 - qca - qtmultimedia-5 + qca-qt6 + qtmultimedia + qt5compat solid sonnet)) + (arguments (list #:qtbase qtbase)) (home-page "https://apps.kde.org/konversation/") (synopsis "Graphical Internet Relay Chat (IRC) client for KDE") (description "Konversation is a graphical Internet Relay Chat client (IRC) @@ -377,38 +377,46 @@ This package is part of the KDE networking module.") (define-public krdc (package (name "krdc") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/krdc-" version ".tar.xz")) (sha256 - (base32 "0jva74n11fpm4ix4sbi0y1xnbly97lnap7dfj0bliw5s2d0sdjr0")))) + (base32 "0xw9ks43llm4lnnswv1h81gmr8mr6191bblmd21c1a5a6vvr935h")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules kdoctools)) + (list extra-cmake-modules pkg-config kdoctools)) (inputs - (list kbookmarks + (list breeze-icons ; default icon set + kbookmarks freerdp kcmutils kcompletion kconfig kdnssd ki18n + kio kiconthemes knotifications knotifyconfig + kstatusnotifieritem kwallet kwidgetsaddons kwindowsystem kxmlgui + plasma-activities libssh libvnc - breeze-icons ; default icon set - qtbase-5)) - (arguments ;; FIXEME: libvnc can't be found for some reason. - (list #:configure-flags #~(list "-DWITH_VNC=NO"))) + ;; XXX: libvnc's Libs.private, remove when we use pkgconf + lzo + libjpeg-turbo + libgcrypt + gnutls)) + (arguments + (list #:configure-flags #~(list "-DQT_MAJOR_VERSION=6") + #:qtbase qtbase)) (home-page "https://apps.kde.org/krdc/") (synopsis "Remote desktop client") (description "KRDC is a client application that allows you to view or even @@ -422,15 +430,16 @@ This package is part of the KDE networking module.") (define-public ktorrent (package (name "ktorrent") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/ktorrent-" version ".tar.xz")) (sha256 - (base32 "17q6ivnbh4zxqnbm1bdzz3hri1434sq2rs9y57lvn4bb2xdwn1z5")))) + (base32 "1m96ch4rfrjnrw9rd7ad3ipc0hvhxl2awb7aqfnk4dd1g8hhjkq0")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -444,6 +453,7 @@ This package is part of the KDE networking module.") kcrash kdbusaddons kdnssd + kglobalaccel ki18n kiconthemes kio @@ -451,18 +461,16 @@ This package is part of the KDE networking module.") knotifyconfig kparts kplotting - kross + kstatusnotifieritem kwidgetsaddons kwindowsystem kxmlgui libgcrypt libktorrent - ;; TODO: LibKWorkspace -> plasma-workspace? breeze-icons ; default icon set phonon - qtbase-5 - qtscript - qtwebengine-5 + qt5compat + qtwebengine solid syndication taglib)) @@ -477,30 +485,30 @@ a full-featured client for BitTorrent.") (define-public libktorrent (package (name "libktorrent") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/" name "-" version ".tar.xz")) (sha256 - (base32 "1m6gyk1bids7qr9wfh6gcfq73ac9j5b2bljvfvfsw9f1ky1cmwab")))) + (base32 "1gr31v09jz5kdvhrpln9abncnnih7db35j3af73m3vlg6izw9z98")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules)) (inputs (list boost gmp - karchive kcrash ki18n kio libgcrypt - qca - qtbase-5 + qca-qt6 solid)) + (propagated-inputs (list karchive qt5compat)) (home-page "https://invent.kde.org/network/libktorrent") - (synopsis "BitTorrent protocol library for C++ / Qt 5 / KDE Frameworks") + (synopsis "BitTorrent protocol library for C++ / Qt 6 / KDE Frameworks") (description "The KTorrent library supports connectivity to HTTP and UDP trackers, mainline DHT and the new generation Micro Transport Protocol (uTP). In addition, it provides many powerful BitTorrent network diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm index b7e7929810..520981550b 100644 --- a/gnu/packages/kde-multimedia.scm +++ b/gnu/packages/kde-multimedia.scm @@ -32,6 +32,7 @@ #:use-module (guix gexp) #:use-module (gnu packages) #:use-module (gnu packages audio) + #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages compression) #:use-module (gnu packages cdrom) @@ -41,6 +42,7 @@ #:use-module (gnu packages gtk) #:use-module (gnu packages gnome) #:use-module (gnu packages gstreamer) + #:use-module (gnu packages kde) #:use-module (gnu packages kde-frameworks) #:use-module (gnu packages libcanberra) #:use-module (gnu packages linux) @@ -59,14 +61,14 @@ (define-public audiocd-kio (package (name "audiocd-kio") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/audiocd-kio-" version ".tar.xz")) (sha256 - (base32 "0kl0j5qy54q88cbclwqj0rn8hj3gzjhzk7bimjgw5w0xy3cw6kql")))) + (base32 "1ldw51wly4shk4c9a0lc6j8ax176bb9f1l5r5x6rcgwz1vncd3g4")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules kdoctools)) @@ -80,8 +82,8 @@ libkcddb libkcompactdisc libvorbis - phonon - qtbase-5)) + phonon)) + (arguments (list #:qtbase qtbase)) (home-page "https://apps.kde.org/kio_audiocd/") (synopsis "Transparent audio CD integration for applications using the KDE Platform") @@ -98,14 +100,14 @@ This package is part of the KDE multimedia module.") (define-public dragon (package (name "dragon") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/dragon-" version ".tar.xz")) (sha256 - (base32 "0mliddp0nyxz91wzy8md0p0i45mlhffip4zqjl4db55x4p6wh4y8")))) + (base32 "1waq80b5lxmk6q31yzs24mrz3nwm1y2rvz21bfhsgh2xw4fqmfsy")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules kdoctools)) @@ -127,8 +129,8 @@ This package is part of the KDE multimedia module.") breeze-icons ; default icon set phonon phonon-backend-vlc - qtbase-5 solid)) + (arguments (list #:qtbase qtbase)) (home-page "https://apps.kde.org/dragonplayer/") (synopsis "Simple video player") (description "Dragon Player is a multimedia player where the focus is on @@ -144,18 +146,18 @@ This package is part of the KDE multimedia module.") (define-public elisa (package (name "elisa") - (version "23.08.5") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/elisa-" version ".tar.xz")) (sha256 - (base32 "1hml0bmp1cfqc9x9q2a1lz2f6ab7ygblf6xz0qlwjxripvqw8b47")))) + (base32 "03hvkn4l4k0jbww5q72spk9nbgfxi8k7zk5z2mlc63c0j7q7w5y0")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules pkg-config dbus kdoctools - xorg-server-for-tests)) + xorg-server-for-tests python-minimal)) (inputs (list kconfig baloo @@ -170,25 +172,22 @@ This package is part of the KDE multimedia module.") kiconthemes kio kirigami - kmediaplayer + kirigami-addons + qqc2-desktop-style kparts kpackage kwidgetsaddons kxmlgui breeze-icons ; default icon set phonon - qtbase-5 - qtdeclarative-5 - qtgraphicaleffects ; not listed as dependency - qtmultimedia-5 - qtquickcontrols-5 - qtquickcontrols2-5 - qtsvg-5 - qtx11extras + qtsvg + qtdeclarative + qtmultimedia ;; TODO: upnpqt https://gitlab.com/homeautomationqt/upnp-player-qt vlc)) (arguments - `(#:tests? #f ;; many tests fail + `(#:qtbase ,qtbase + #:tests? #f ;; many tests fail #:phases (modify-phases %standard-phases (add-before 'check 'start-xorg-server @@ -215,19 +214,21 @@ its own database. You can build and play your own playlist.") (define-public ffmpegthumbs (package (name "ffmpegthumbs") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/ffmpegthumbs-" version ".tar.xz")) (sha256 - (base32 "02wvhjqqird55xcs4kkj0s7nam4vqh3khjz5f1mjqfnk62sj1plx")))) + (base32 "1b7jajn7mr5g6k9j3b0b8qng175748w9qd2bxj3v0sksi7ayn4bw")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules pkg-config)) (inputs - (list ffmpeg kconfig ki18n kio taglib qtbase-5)) + (list ffmpeg kconfig ki18n kio taglib)) + (arguments (list #:qtbase qtbase + #:configure-flags #~(list "-DQT_MAJOR_VERSION=6"))) (home-page "https://apps.kde.org/ffmpegthumbs/") (synopsis "Video thumbnail generator for KDE using ffmpeg") (description " @@ -241,14 +242,14 @@ This package is part of the KDE multimedia module.") (define-public juk (package (name "juk") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/juk-" version ".tar.xz")) (sha256 - (base32 "1q0r0iv4nn6jd0g8db54r7xdw7kdw1ja0z1ggxl1sy0k60m9c4q3")))) + (base32 "1yk6c0lagj47m5i7s73rsrk61fs1cjbf0dhhvbyasy4avlxsfgxa")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules kdoctools)) @@ -265,6 +266,7 @@ This package is part of the KDE multimedia module.") kio knotifications ktextwidgets + kstatusnotifieritem kwallet kwidgetsaddons kwindowsystem @@ -272,9 +274,10 @@ This package is part of the KDE multimedia module.") breeze-icons ; default icon set phonon phonon-backend-vlc - qtbase-5 - qtsvg-5 + qtbase + qtsvg taglib)) + (arguments (list #:qtbase qtbase)) (home-page "https://apps.kde.org/juk/") (synopsis "Music jukebox / music player") (description "JuK is a powerful music player capable of managing a large @@ -295,7 +298,7 @@ This package is part of the KDE multimedia module.") (define-public kid3 (package (name "kid3") - (version "3.9.4") + (version "3.9.5") (source (origin (method git-fetch) @@ -304,29 +307,32 @@ This package is part of the KDE multimedia module.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0j454nzwx0v7iwcixyjcx71shzh3ag4ydggs8d68alrfj9f4ajap")))) + (base32 "09pva85ffamjdr6m446jcvxjw8qyy7anmj1gz0fvn9ns3d1jgg46")))) (build-system qt-build-system) (arguments (list #:configure-flags - #~(list (string-append "-DDOCBOOK_XSL_DIR=" - #$(this-package-native-input "docbook-xsl"))) + #~(list + "-DBUILD_WITH_QT6=ON" + (string-append "-DDOCBOOK_XSL_DIR=" + #$(this-package-native-input "docbook-xsl"))) + #:qtbase qtbase #:phases - `(modify-phases %standard-phases - ;; FIXME: Documentation build scripts use unix pipes, which will fail - ;; in the build environment. - (add-after 'unpack 'skip-docs - (lambda _ - (substitute* "CMakeLists.txt" - (("add_subdirectory\\(doc\\)") ""))))))) + #~(modify-phases %standard-phases + ;; FIXME: Documentation build scripts use unix pipes, which will fail + ;; in the build environment. + (add-after 'unpack 'skip-docs + (lambda _ + (substitute* "CMakeLists.txt" + (("add_subdirectory\\(doc\\)") ""))))))) (native-inputs (list docbook-xsl extra-cmake-modules ffmpeg-4 kdoctools libxslt - python-wrapper - qttools-5)) + python-minimal-wrapper + qttools)) (inputs (list chromaprint flac @@ -338,9 +344,8 @@ This package is part of the KDE multimedia module.") kwidgetsaddons kxmlgui libvorbis - qtbase-5 - qtdeclarative-5 - qtmultimedia-5 + qtdeclarative + qtmultimedia readline taglib zlib)) @@ -353,52 +358,51 @@ variety of formats.") (define-public k3b (package (name "k3b") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/k3b-" version ".tar.xz")) (sha256 - (base32 "1kr1hw4pws87zzwyrwrg2ysdn11qf0qhwi1vc9b0k8jkjmmdplmb")))) + (base32 "11r6nda3djj9p918sx9bpipc1byg5mvgib4vyf0kpdpnh9bnhvcj")))) (build-system qt-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'set-absolute-library-paths - (lambda* (#:key inputs #:allow-other-keys) - ;; Set absolute paths for dlopened libraries. We can’t use k3b’s - ;; runpath as they are loaded by the Qt library. - (let ((libcdio-paranoia (assoc-ref inputs "libcdio-paranoia")) - (libdvdcss (assoc-ref inputs "libdvdcss"))) - (substitute* "libk3b/tools/k3bcdparanoialib.cpp" - (("\"(cdio_cdda|cdio_paranoia)\"" _ library) - (string-append "\"" libcdio-paranoia "/lib/" library "\""))) - (substitute* "libk3b/tools/k3blibdvdcss.cpp" - (("\"(dvdcss)\"" _ library) - (string-append "\"" libdvdcss "/lib/" library "\"")))) - #t)) - (add-before 'configure 'fix-cmake-taglib - (lambda _ - ;; Use the CMake variables provided by FindTaglib from - ;; extra-cmake-modules, instead of bundled FindTaglib.cmake: - (substitute* - '("plugins/decoder/mp3/CMakeLists.txt" - "plugins/decoder/flac/CMakeLists.txt" - "plugins/project/audiometainforenamer/CMakeLists.txt") - (("TAGLIB_INCLUDES") "Taglib_INCLUDE_DIRS") - (("TAGLIB_LIBRARIES") "Taglib_LIBRARIES")))) - (add-after 'qt-wrap 'wrap-path - (lambda* (#:key inputs outputs #:allow-other-keys) - ;; Set paths to backend programs. - (wrap-program (string-append (assoc-ref outputs "out") "/bin/k3b") - `("PATH" ":" prefix - ,(map (lambda (input) - (string-append (assoc-ref inputs input) "/bin")) - '("cdrdao" "cdrtools" "dvd+rw-tools" "libburn" "sox")))) - #t))))) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'set-absolute-library-paths + (lambda* (#:key inputs #:allow-other-keys) + ;; Set absolute paths for dlopened libraries. We can’t use k3b’s + ;; runpath as they are loaded by the Qt library. + (let ((libcdio-paranoia (assoc-ref inputs "libcdio-paranoia")) + (libdvdcss (assoc-ref inputs "libdvdcss"))) + (substitute* "libk3b/tools/k3bcdparanoialib.cpp" + (("\"(cdio_cdda|cdio_paranoia)\"" _ library) + (string-append "\"" libcdio-paranoia "/lib/" library "\""))) + (substitute* "libk3b/tools/k3blibdvdcss.cpp" + (("\"(dvdcss)\"" _ library) + (string-append "\"" libdvdcss "/lib/" library "\"")))))) + (add-before 'configure 'fix-cmake-taglib + (lambda _ + ;; Use the CMake variables provided by FindTaglib from + ;; extra-cmake-modules, instead of bundled FindTaglib.cmake: + (substitute* + '("plugins/decoder/mp3/CMakeLists.txt" + "plugins/decoder/flac/CMakeLists.txt" + "plugins/project/audiometainforenamer/CMakeLists.txt") + (("TAGLIB_INCLUDES") "Taglib_INCLUDE_DIRS") + (("TAGLIB_LIBRARIES") "Taglib_LIBRARIES")))) + (add-after 'qt-wrap 'wrap-path + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; Set paths to backend programs. + (wrap-program (string-append (assoc-ref outputs "out") "/bin/k3b") + `("PATH" ":" prefix + ,(map (lambda (input) + (string-append (assoc-ref inputs input) "/bin")) + '("cdrdao" "cdrtools" "dvd+rw-tools" "libburn" "sox"))))))))) (native-inputs - (list extra-cmake-modules pkg-config kdoctools)) + (list extra-cmake-modules pkg-config kdoctools-5)) (inputs (list bash-minimal cdrdao @@ -406,28 +410,28 @@ variety of formats.") dvd+rw-tools ffmpeg flac - karchive - kcmutils - kconfig - kcoreaddons - kfilemetadata - ki18n - kiconthemes - kio - kjobwidgets - knewstuff - knotifications - knotifyconfig - kservice - kwidgetsaddons - kxmlgui + karchive-5 + kcmutils-5 + kconfig-5 + kcoreaddons-5 + kfilemetadata-5 + ki18n-5 + kiconthemes-5 + kio-5 + kjobwidgets-5 + knewstuff-5 + knotifications-5 + knotifyconfig-5 + kservice-5 + kwidgetsaddons-5 + kxmlgui-5 lame libburn libcdio-paranoia libdvdcss libdvdread ;; TODO: LibFuzzer - libkcddb + libkcddb-qt5 libmad libmpcdec ;;("libmusicbrainz" ,libmusicbrainz) ; wants old version 2 @@ -435,9 +439,8 @@ variety of formats.") libsndfile libvorbis breeze-icons ; default icon set - qtbase-5 shared-mime-info - solid + solid-5 sox taglib zlib)) @@ -466,32 +469,31 @@ the available CD drives.") (base32 "10dnhr9v2jlki44i3gmjagky66ybixmv6f29z5imk9clgddrlyfr")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules pkg-config kdoctools)) + (list extra-cmake-modules pkg-config kdoctools-5)) (inputs (list eudev - kcoreaddons - kdbusaddons - ki18n - kio - kwidgetsaddons - kwindowsystem - kxmlgui + kcoreaddons-5 + kdbusaddons-5 + ki18n-5 + kio-5 + kwidgetsaddons-5 + kwindowsystem-5 + kxmlgui-5 libxscrnsaver breeze-icons ; default icon set qtbase-5 qtx11extras - solid + solid-5 v4l-utils ; libdvbv5 vlc)) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-code - (lambda _ - (substitute* "src/dvb/dvbdevice_linux.cpp" - (("\\s*qPrintable\\(transponder\\.getTransmissionType\\(\\)\\)\\);") - "transponder.getTransmissionType());")) - #t))))) + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-code + (lambda _ + (substitute* "src/dvb/dvbdevice_linux.cpp" + (("\\s*qPrintable\\(transponder\\.getTransmissionType\\(\\)\\)\\);") + "transponder.getTransmissionType());"))))))) (home-page "https://apps.kde.org/kaffeine/") (synopsis "Versatile media player for KDE") (description "Kaffeine is a media player for KDE. While it supports @@ -507,31 +509,32 @@ autoloading of subtitle files for use while playing video.") (define-public kamoso (package (name "kamoso") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kamoso-" version ".tar.xz")) (sha256 - (base32 "1f06331qigf5wi6lgir5ij8h1fsdn54v32fyw2mgf0hg05xndrcl")))) + (base32 "1i2w2cmlfr9q4p405kycy2xqp8q5d6f1j3pwr5sbdhis3rm7vm4l")))) (build-system qt-build-system) (native-inputs - `(("extra-cmake-modules" ,extra-cmake-modules) - ("glib:bin" ,glib "bin") - ("kdoctools" ,kdoctools) - ("pkg-config" ,pkg-config))) + (list + extra-cmake-modules + `(,glib "bin") + kdoctools-5 + pkg-config)) (inputs (list gstreamer gst-plugins-base - kconfig - ki18n - kio - kirigami - knotifications - kparts + kconfig-5 + ki18n-5 + kio-5 + kirigami-5 + knotifications-5 + kparts-5 breeze-icons ; default icon set - purpose + purpose-5 qtbase-5 qtdeclarative-5 qtgraphicaleffects @@ -550,39 +553,39 @@ camera. Use it to take pictures and make videos to share.") (define-public kmix (package (name "kmix") - (version "23.04.3") + (version "24.05.2") (source (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/release-service/" version - "/src/kmix-" version ".tar.xz")) - (sha256 - (base32 "09pfsa6y1phm6z24da60s47gc18w4cvv7r8sxh5qfww7b0dnhixj")))) + (method url-fetch) + (uri (string-append "mirror://kde/stable/release-service/" version + "/src/kmix-" version ".tar.xz")) + (sha256 + (base32 "1ha0sil2vbpvgys7jkhav7j5g7drg57ypr8c9i3c8ndqwpsyxk3g")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules kdoctools pkg-config)) + (list extra-cmake-modules kdoctools-5 pkg-config)) (inputs (list alsa-lib glib - kconfigwidgets - kcompletion - kconfig - kconfigwidgets - kcrash - kdbusaddons - kglobalaccel - ki18n - kiconthemes - knotifications - kwidgetsaddons - kwindowsystem - kxmlgui + kconfigwidgets-5 + kcompletion-5 + kconfig-5 + kconfigwidgets-5 + kcrash-5 + kdbusaddons-5 + kglobalaccel-5 + ki18n-5 + kiconthemes-5 + knotifications-5 + kwidgetsaddons-5 + kwindowsystem-5 + kxmlgui-5 libcanberra breeze-icons ; default icon set plasma-framework pulseaudio qtbase-5 - solid)) + solid-5)) (home-page "https://apps.kde.org/kmix/") (synopsis "Volume control and mixer") (description "KMix is an audio device mixer, used to adjust volume, select @@ -592,109 +595,40 @@ This package is part of the KDE multimedia module.") (license ;; GPL for programs, LGPL for libraries, FDL for documentation (list license:gpl2+ license:lgpl2.0+ license:fdl1.2+)))) -(define-public kmplayer - ;; The latest release was in 2016, and does not work with the newer - ;; KDE libraries. - (let ((commit "88e85308b71dc5e58cc655b5b9a13cd71b78233f") - (revision "1")) - (package - (name "kmplayer") - (version (git-version "0.12.0b" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://invent.kde.org/multimedia/kmplayer") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1pzk0js499diqabpwxjq6nnwpmj1ikpyyykzjbm844xcbm74cl19")))) - (build-system qt-build-system) - (native-inputs - (list extra-cmake-modules pkg-config kdoctools)) - (inputs - (list kbookmarks - kconfig - kcoreaddons - kdelibs4support - ki18n - kinit - kio - kparts - kmediaplayer - kwidgetsaddons - libxcb ;; FIXME: why does cmake not find XEVIE and XPRINT? - breeze-icons ; default icon set - phonon - qtbase-5 - cairo - qtsvg-5 - qtx11extras - xcb-util - xcb-util-cursor - xcb-util-errors - xcb-util-image - xcb-util-keysyms - xcb-util-wm)) - (arguments - (list #:configure-flags - #~(list (string-append - "-DCMAKE_CXX_FLAGS=-I" - #$(this-package-input "qtx11extras") - "/include/qt5")))) - (home-page "https://apps.kde.org/kmplayer/") - (synopsis "Media player using mplayer/phonon as backend") - (description "Kmplayer can play all the audio/video supported by -mplayer/phonon from a local file or URL and be embedded in Konqueror and -KHTML. It also plays DVDs. - -Some features: -@itemize -@item play DVD/VCD movies (from file or url and from a video device) -@item embed inside konqueror (movie is played inside konqueror) -@item embed inside khtml (movie playback inside a html page) -@item Movie recording using mencoder (part of the mplayer package) -@item No video during recording, but you can always open a new window and play it -@item Broadcasting, http streaming, using ffserver/ffmpeg -@item For TV sources, you need v4lctl (part of the xawtv package) -@end itemize") - (license ;; GPL for programs, LGPL for libraries, FDL for documentation - (list license:gpl2+ license:lgpl2.0+ license:fdl1.2+))))) - (define-public kwave (package (name "kwave") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version - "/src/kwave-" version ".tar.xz")) + "/src/kwave-" version ".tar.xz")) (sha256 - (base32 "0s9w8jgwblljwfji2a19bqs3nx6sr2qzz35kwbi0ahwncy69k4jx")))) + (base32 "1g3gaxmchsf9c7zvx608wl41qs001vr1zm0cgnaim753446vb08f")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules (librsvg-for-system) pkg-config kdoctools)) + (list extra-cmake-modules (librsvg-for-system) pkg-config kdoctools-5 + tzdata-for-tests)) (inputs (list alsa-lib audiofile flac id3lib - karchive - kcompletion - kconfig - kconfigwidgets - kcoreaddons - kcrash - kdbusaddons - ki18n - kiconthemes - kio - kservice - ktextwidgets - kwidgetsaddons - kxmlgui + karchive-5 + kcompletion-5 + kconfig-5 + kconfigwidgets-5 + kcoreaddons-5 + kcrash-5 + kdbusaddons-5 + ki18n-5 + kiconthemes-5 + kio-5 + kservice-5 + ktextwidgets-5 + kwidgetsaddons-5 + kxmlgui-5 libmad libsamplerate libvorbis @@ -704,6 +638,15 @@ Some features: qtbase-5 qtmultimedia-5 zlib)) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'set-TZDATA + (lambda* (#:key inputs tests? #:allow-other-keys) + (setenv "TZDIR" + (search-input-directory inputs + "share/zoneinfo"))))))) (home-page "https://apps.kde.org/kwave/") (synopsis "Sound editor for KDE") (description "Kwave is a sound editor designed for the KDE Desktop @@ -739,14 +682,14 @@ Its features include: (define-public libkcddb (package (name "libkcddb") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/libkcddb-" version ".tar.xz")) (sha256 - (base32 "1s10g6m6c3h14gzxvp2s0v51jxzsrh23xfn7gl51a0r50srbbz52")))) + (base32 "0b2khcfm3jnc4iar0ljsq0z3dr3ak6jyaqnbgwj3yk2j05j0yc9n")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules kdoctools)) @@ -757,27 +700,50 @@ Its features include: kio kcmutils kwidgetsaddons - libmusicbrainz - qtbase-5)) + libmusicbrainz)) (arguments - `(#:tests? #f)) ; Most tests require network + (list + #:qtbase qtbase + #:configure-flags #~(list "-DQT_MAJOR_VERSION=6") + #:tests? #f)) ; Most tests require network (home-page "https://invent.kde.org/multimedia/libkcddb") (synopsis "CDDB library for KDE Platform (runtime)") (description "A library for retrieving and sending cddb information.") (license ;; GPL for programs, LGPL for libraries, FDL for documentation (list license:gpl2+ license:lgpl2.0+ license:fdl1.2+)))) +(define-public libkcddb-qt5 + (package + (inherit libkcddb) + (name "libkcddb-qt5") + (native-inputs + (list extra-cmake-modules kdoctools-5)) + (inputs + (list kcodecs-5 + kconfig-5 + ki18n-5 + kio-5 + kcmutils-5 + kwidgetsaddons-5 + libmusicbrainz)) + (arguments + (list + #:qtbase qtbase-5 + #:configure-flags #~(list "-DQT_MAJOR_VERSION=5") + ;; Most tests require network + #:tests? #f)))) + (define-public libkcompactdisc (package (name "libkcompactdisc") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/libkcompactdisc-" version ".tar.xz")) (sha256 - (base32 "0gl21mhfz3vj89x0r8y79yiijcag1xfdnyfrjqzkx9i8yd2k45b1")))) + (base32 "1lh6vn5aqwlvnb7q29nwxqzb4i4ymd1gs0y1k0vf5czhywrr9gqm")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) @@ -786,8 +752,10 @@ Its features include: kcoreaddons ki18n phonon - qtbase-5 solid)) + (arguments (list + #:configure-flags #~(list "-DQT_MAJOR_VERSION=6") + #:qtbase qtbase)) (home-page "https://invent.kde.org/multimedia/libkcompactdisc") (synopsis "KDE library for playing & ripping CDs") (description "The KDE Compact Disc library provides an API for diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index 5780b9dbca..c95cf653c2 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -45,23 +45,25 @@ #:use-module (gnu packages openldap) #:use-module (gnu packages pdf) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages python) #:use-module (gnu packages qt) #:use-module (gnu packages search) #:use-module (gnu packages sqlite) #:use-module (gnu packages tls) + #:use-module (gnu packages xdisorg) #:use-module (gnu packages xml)) (define-public akonadi (package (name "akonadi") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/akonadi-" version ".tar.xz")) (sha256 (base32 - "0jpp91d5rlblq6r981wxizmsv512kc43lfk8y29bdky6j4idflrb")) + "0ygxj2hhslg5frarwhmdqqhvd37kzcgm60krs979f378dkj6cyc8")) (patches (search-patches "akonadi-paths.patch" "akonadi-timestamps.patch" "akonadi-not-relocatable.patch")))) @@ -69,12 +71,12 @@ (native-inputs (list dbus extra-cmake-modules - qttools-5 + qttools shared-mime-info pkg-config)) (inputs (list boost - libaccounts-qt + libaccounts-qt6 kconfig kconfigwidgets kcoreaddons @@ -92,11 +94,11 @@ ;; Do NOT add mysql or postgresql to the inputs. Otherwise the binaries ;; and wrapped files will refer to them, even if the user choices none ;; of these. Executables are searched on $PATH then. - signond - qtbase-5)) + signond)) (propagated-inputs (list sqlite kaccounts-integration)) (arguments - (list #:tests? #f + (list #:qtbase qtbase + #:tests? #f #:configure-flags #~'("-DDATABASE_BACKEND=SQLITE") ;lightweight #:modules `((ice-9 textual-ports) ,@%qt-build-system-modules) @@ -136,44 +138,46 @@ programs.") (define-public akonadi-calendar (package (name "akonadi-calendar") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/akonadi-calendar-" version ".tar.xz")) (sha256 - (base32 "166xm57jcy7d2dv2pfy4lllzic4giin31szxz7xq3a7ixsd6g7cs")))) + (base32 "0nwl3jn7qqhs19ydxidjzh7vdll5s17pw4xaazmd3g7fg6mngnzh")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) (inputs - (list akonadi - akonadi-contacts + (list akonadi-contacts akonadi-mime boost - grantlee grantleetheme - kcalendarcore kcalutils kcodecs kcontacts kdbusaddons - ki18n kiconthemes - kidentitymanagement kio kitemmodels kmailtransport kmime + kmessagelib knotifications kpimtextedit ksmtp ktextwidgets - kwallet - qtbase-5)) + kxmlgui + kwallet)) + (propagated-inputs (list akonadi + kcalendarcore + ki18n + kwidgetsaddons + kidentitymanagement)) (arguments - `(#:tests? #f)) ;; TODO: 1/1 test fails + (list #:qtbase qtbase + #:tests? #f)) ;; TODO: 1/1 test fails (home-page "https://api.kde.org/kdepim/akonadi/html/index.html") (synopsis "Library providing calendar helpers for Akonadi items") (description "This library manages calendar specific actions for @@ -183,21 +187,20 @@ collection and item views.") (define-public akonadi-contacts (package (name "akonadi-contacts") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/akonadi-contacts-" version ".tar.xz")) (sha256 - (base32 "10vlzj56ps1pysf7g6i14v8wp2wkxh53055r2v4iq4cpq3mzayc6")))) + (base32 "1207dgilr5y4b3g3fk2ywyvb6mryq2xrpkhi6cyhgn8k84q201fn")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) (inputs (list akonadi boost - grantlee grantleetheme kauth kcmutils @@ -215,14 +218,17 @@ collection and item views.") kmime kservice ktextwidgets + ktexttemplate + ktextaddons + ktexteditor kwidgetsaddons kxmlgui - libkleo prison kio - qtbase-5 solid sonnet)) + (arguments + (list #:qtbase qtbase)) (home-page "https://api.kde.org/kdepim/akonadi/html/index.html") (synopsis "Akonadi contacts access library") (description "Akonadi Contacts is a library that effectively bridges the @@ -238,14 +244,14 @@ to list and filter contacts.") (define-public akonadi-mime (package (name "akonadi-mime") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/akonadi-mime-" version ".tar.xz")) (sha256 - (base32 "1r33v2q49s7l90id4jqg0lar9p1j5k0cbnzsaqdksavzpzkcklh5")))) + (base32 "1y6h53jfy77g7198cp5rfv0zabvfjg6fsw95wp4khcjvmm0qhzqm")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules libxslt ;; xslt for generating interface descriptions @@ -262,21 +268,22 @@ to list and filter contacts.") kitemmodels kmime kwidgetsaddons - kxmlgui - qtbase-5)) + kxmlgui)) (home-page "https://api.kde.org/kdepim/akonadi/html/index.html") (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'copy-desktop-file-early - (lambda _ - (let ((plugins-dir "/tmp/.local/share/akonadi/plugins/serializer")) - (mkdir-p plugins-dir) - (copy-file "serializers/akonadi_serializer_mail.desktop" - (string-append plugins-dir "/akonadi_serializer_mail.desktop"))))) - (add-before 'check 'check-setup - (lambda _ - (setenv "HOME" "/tmp")))))) + (list + #:qtbase qtbase + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'copy-desktop-file-early + (lambda _ + (let ((plugins-dir "/tmp/.local/share/akonadi/plugins/serializer")) + (mkdir-p plugins-dir) + (copy-file "serializers/akonadi_serializer_mail.desktop" + (string-append plugins-dir "/akonadi_serializer_mail.desktop"))))) + (add-before 'check 'check-setup + (lambda _ + (setenv "HOME" "/tmp")))))) (synopsis "Akonadi MIME handling library") (description "Akonadi Mime is a library that effectively bridges the type-agnostic API of the Akonadi client libraries and the domain-specific @@ -288,19 +295,20 @@ with emails through Akonadi easier.") (define-public akonadi-notes (package (name "akonadi-notes") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/akonadi-notes-" version ".tar.xz")) (sha256 - (base32 "0s5a414cdcz37srys2w3c2z5c63ha9ivsqj0srnfwwv0pxix266v")))) + (base32 "0cb1nbjlsx3lhz27ggrhmgrbgljhwrh7pssmx4jkljhahi57vwxa")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) (inputs - (list akonadi kcodecs ki18n kmime qtbase-5)) + (list akonadi kcodecs ki18n kmime)) + (arguments (list #:qtbase qtbase)) (home-page "https://api.kde.org/kdepim/akonadi/html/index.html") (synopsis "Akonadi notes access library") (description "Akonadi Notes is a library that effectively bridges the @@ -313,14 +321,14 @@ wrapping notes into KMime::Message objects.") (define-public akonadi-search (package (name "akonadi-search") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/akonadi-search-" version ".tar.xz")) (sha256 - (base32 "1hpclfcb7almvajscm2az36bw9rrhkp3ywb9h0j9h8ims2gm60m7")))) + (base32 "11lasaim65d37n0q8pyxnn0sqqq2liz6va951qc3bav8njigsny1")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules @@ -335,29 +343,33 @@ wrapping notes into KMime::Message objects.") kcontacts kcrash kdbusaddons + ktextaddons ki18n kio kitemmodels kmime + kxmlgui krunner kwindowsystem - qtbase-5 xapian)) (arguments - `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'disable-failing-test - (lambda _ - ;; FIXME: This test fails because it fails to establish - ;; a socket connection, seemingly due to failure during - ;; DBus communication. See also 'korganizer'. - (substitute* "agent/autotests/CMakeLists.txt" - ((".*schedulertest\\.cpp.*") - "")))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "dbus-launch" "ctest" "-E" - "akonadi-sqlite-collectionindexingjobtest"))))))) + (list + #:qtbase qtbase + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'disable-failing-test + (lambda _ + ;; FIXME: This test fails because it fails to establish + ;; a socket connection, seemingly due to failure during + ;; DBus communication. See also 'korganizer'. + (substitute* "agent/autotests/CMakeLists.txt" + ((".*schedulertest\\.cpp.*") + "")))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "dbus-launch" "ctest" "-E" + "akonadi-sqlite-collectionindexingjobtest"))))))) (home-page "https://api.kde.org/kdepim/akonadi/html/index.html") (synopsis "Akonadi search library") (description "This package provides a library used to search in the @@ -368,18 +380,29 @@ Akonadi PIM data server. It uses Xapian for indexing and querying.") (define-public itinerary (package (name "itinerary") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/" name "-" version ".tar.xz")) (sha256 (base32 - "132x68wc4pallxgkvridfsimfq5m2g47fj9lcgz1kq4gdsidzf6i")))) + "1p05v9r1ipi465nmka8n2gs7npc6wdgfxzj7523plnja9kfa8bmb")))) (build-system qt-build-system) + (arguments - `(#:tests? #f)) ;Fails 20/27 - (native-inputs (list extra-cmake-modules)) + (list #:qtbase qtbase + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'stop-require-qmlmodule + (lambda _ + ;; HACK: ecm_find_qmlmodule cann't find qmlmodule on other + ;; prefix, so we remove it require. + (substitute* "CMakeLists.txt" + (("24.02 REQUIRED") + "24.02"))))) + #:tests? #f)) ;Fails 20/27 + (native-inputs (list extra-cmake-modules python-minimal)) (inputs (list karchive kdbusaddons ki18n @@ -402,11 +425,10 @@ Akonadi PIM data server. It uses Xapian for indexing and querying.") kunitconversion kwindowsystem prison - qtdeclarative-5 - qtgraphicaleffects + qtdeclarative + qtpositioning qtlocation - qtmultimedia-5 - qtquickcontrols2-5 + qtmultimedia qqc2-desktop-style shared-mime-info solid @@ -418,19 +440,19 @@ Akonadi PIM data server. It uses Xapian for indexing and querying.") "This package provides a tool for managing itinerary and boarding pass information.") (license ;GPL for programs, LGPL for libraries - (list license:gpl2+ license:lgpl2.0+)))) + (list license:gpl2+ license:lgpl2.0+)))) (define-public kincidenceeditor (package (name "kincidenceeditor") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/incidenceeditor-" version ".tar.xz")) (sha256 - (base32 "1pqfl7gqz7ibpns2gpwqpvzhsba7xj4ilhi4ax1vn3m086iyh3a0")))) + (base32 "1kwqr6h2b5jlxkd52g4kdnk78v3xpzqy3d2rl582j7fkhnnsfk40")))) (properties `((upstream-name . "incidenceeditor"))) (build-system qt-build-system) (native-inputs @@ -441,13 +463,13 @@ information.") akonadi-contacts akonadi-mime boost - grantlee grantleetheme kcalendarcore kcalendarsupport kcalutils kcodecs kcontacts + kconfigwidgets kdbusaddons kdiagram keventviews @@ -464,18 +486,20 @@ information.") kpimtextedit ktextaddons ktextwidgets + kxmlgui kwallet - libkdepim - qtbase-5)) + libkdepim)) (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "dbus-launch" "ctest" ;; FIXME: tests fails. - "-E" - "(akonadi-sqlite-incidencedatetimetest|ktimezonecomboboxtest|testindividualmaildialog)"))))))) + (list + #:qtbase qtbase + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "dbus-launch" "ctest" ;; FIXME: tests fails. + "-E" + "(akonadi-sqlite-incidencedatetimetest|ktimezonecomboboxtest|testindividualmaildialog)"))))))) (home-page "https://invent.kde.org/pim/incidenceeditor") (synopsis "KDE PIM library for editing incidences") (description "This library provides an incidence editor for KDE PIM.") @@ -485,14 +509,14 @@ information.") (define-public kaddressbook (package (name "kaddressbook") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kaddressbook-" version ".tar.xz")) (sha256 - (base32 "0zjbri91dh9vnwi6jqkbmyq667yzn8g4kw5v47qn8id2629zj6jq")))) + (base32 "1g5qkg3m7djqrq28ypv998yp45kzldd3jss37ygdnbqwr5i4wjb8")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules kdoctools)) @@ -502,8 +526,7 @@ information.") akonadi-mime akonadi-search boost - gpgme - grantlee + gpgme-1.23 grantleetheme kcalendarcore kcmutils @@ -528,8 +551,8 @@ information.") libkleo breeze-icons ; default icon set, required for tests prison - qgpgme - qtbase-5)) + qgpgme-qt6-1.23)) + (arguments (list #:qtbase qtbase)) (home-page "https://kontact.kde.org/components/kaddressbook/") (synopsis "Address Book application to manage your contacts") (description "KAddressBook stores all the personal details of your family, @@ -538,51 +561,17 @@ NextCloud, Kolab, Google Contacts, Microsoft Exchange (EWS) or any standard CalDAV server.") (license (list license:gpl2+ license:lgpl2.0+ license:fdl1.2+)))) -(define-public kblog - (package - (name "kblog") - (version "20.04.3") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/release-service/" version - "/src/kblog-" version ".tar.xz")) - (sha256 - (base32 "1d5r9ivc1xmhkrz780xga87p84h7dnxjl981qap16gy37sxahcjr")))) - (build-system qt-build-system) - (native-inputs - (list extra-cmake-modules)) - (inputs - (list kcalendarcore - kcoreaddons - ki18n - kio - kxmlrpcclient - qtbase-5 - syndication)) - ;; Note: Some tests take up to 90 sec. - (home-page "https://invent.kde.org/pim/kblog") - (synopsis "Client-side support library for web application remote blogging -APIs") - (description "KBlog is a library for calling functions on Blogger 1.0, -MetaWeblog, MovableType and GData compatible blogs. It calls the APIs using -KXmlRpcClient and Syndication. It supports asynchronous sending and fetching -of posts and, if supported on the server, multimedia files. Almost every -modern blogging web application that provides an XML data interface supports -one of the APIs mentioned above.") - (license license:lgpl2.0+))) - (define-public kaccounts-integration (package (name "kaccounts-integration") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/" name "-" version ".tar.xz")) (sha256 (base32 - "1mn64xw5r2magy5y0qmg5r907jz1y8jar0qqkc6s1zjjr3s3knac")))) + "0dbv1yv6qq0rgjlczmky7fmwa3rspyssd6grdbgzyy3k0v35m1fi")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) (inputs (list kcmutils @@ -592,9 +581,10 @@ one of the APIs mentioned above.") kdeclarative kwallet kio - libaccounts-qt - qcoro-qt5 - signond)) + libaccounts-qt6 + qcoro-qt6 + signond-qt6)) + (arguments (list #:qtbase qtbase)) (home-page "https://invent.kde.org/network/kaccounts-integration") (synopsis "Online account management system") (description "The Kaccounts Integration library provides online account @@ -604,129 +594,49 @@ management system and its Plasma integration components.") (define-public kaccounts-providers (package (name "kaccounts-providers") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/" name "-" version ".tar.xz")) (sha256 (base32 - "1lrmj6r09ypnpl2s586i4rd3fk3760qlxyrhh91k43wkb8i6m8f0")))) + "1mfidlhy8jh3ar9rpn39a52q6sfhc5f4yn30p2ihv9l7xi5r9vk0")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules intltool)) (inputs (list kaccounts-integration kcoreaddons kdeclarative + kpackage ki18n kio - libaccounts-qt - qtwebengine-5 - signond)) + libaccounts-qt6 + qtwebengine + signond-qt6)) + (arguments (list #:qtbase qtbase)) (home-page "https://invent.kde.org/network/kaccounts-providers") (synopsis "Online account providers for the KAccounts system") (description "This package provides online account providers for the KAccounts system.") (license license:lgpl2.0+))) -(define-public kalendar - (package - (name "kalendar") - (version "23.04.3") - (source (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/release-service/" - version "/src/" name "-" version - ".tar.xz")) - (sha256 - (base32 - "1w56glv8m1rlk86v78h69d21ydxb6i61g1dk6mcizjr5rvi4liy0")))) - (build-system qt-build-system) - (arguments - (list #:tests? #f ;All 2 tests fail - #:phases - #~(modify-phases %standard-phases - (add-after 'install 'wrap-script - (lambda* (#:key inputs outputs #:allow-other-keys) - (wrap-program (string-append #$output - "/bin/kalendar") - `("PATH" ":" prefix - (,(string-append #$(this-package-input "akonadi") - "/bin")))))) - (delete 'check) - (add-after 'wrap-script 'check-again - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "dbus-launch" "ctest"))))))) - (native-inputs (list dbus extra-cmake-modules)) - (inputs (list akonadi - akonadi-contacts - breeze-icons - gpgme - grantlee - grantleetheme - kio - kirigami - kirigami-addons - kdbusaddons - ki18n - kimap - kcalendarcore - kcalendarsupport - kconfigwidgets - kwindowsystem - kcoreaddons - kcontacts - kitemmodels - kmailcommon - kmessagelib - kmime - kidentitymanagement - kpimcommon - kpimtextedit - ktextaddons - ktextwidgets - akonadi-calendar - akonadi-mime - keventviews - kcalutils - kxmlgui - kiconthemes - libkdepim - libkleo - qtbase-5 - qtdeclarative-5 - qtquickcontrols2-5 - qtsvg-5 - qtquickcontrols-5 - qtgraphicaleffects - qtlocation - qqc2-desktop-style - qtwebengine-5)) - (home-page "https://apps.kde.org/kalendar/") - (synopsis "Calendar application") - (description - "Kalendar is a calendar application using Akonadi to sync with -external services.") - (license license:gpl3+))) - (define-public kcalendarsupport (package (name "kcalendarsupport") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/calendarsupport-" version ".tar.xz")) (sha256 - (base32 "1zk6kv5nhcd7a5llzh31890xpqdg522ahjdgbwsm7pcp62y0nbsj")))) + (base32 "0qih5p810h1860diqb9yszrv0arf63bd32x7rfizw6mhpkh20ryq")))) (properties `((upstream-name . "calendarsupport"))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules qttools-5)) + (list extra-cmake-modules qttools)) (inputs (list akonadi - akonadi-calendar akonadi-mime akonadi-notes boost @@ -738,15 +648,14 @@ external services.") kholidays ki18n kiconthemes - kidentitymanagement kio kitemmodels - kmime kpimcommon kpimtextedit ktextwidgets - kxmlgui - qtbase-5)) + kxmlgui)) + (propagated-inputs (list akonadi-calendar kidentitymanagement kmime)) + (arguments (list #:qtbase qtbase)) (home-page "https://api.kde.org/kdepim/calendarsupport/html/index.html") (synopsis "Calendar Support library for KDE PIM") (description "The Calendar Support library provides helper utilities for @@ -757,19 +666,19 @@ calendaring applications.") (define-public kcalutils (package (name "kcalutils") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kcalutils-" version ".tar.xz")) (sha256 - (base32 "1j7f5ai25zcxggw3dvky624asxim5bkd6a35rcdzkjhj1qwk3vll")))) + (base32 "1hiygvhw9nmqsz7pca6za9as06m8l0wsv78ski6gcjwzpi7qh0vq")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules libxml2)) ;; xmllint required for tests (inputs - (list grantlee + (list breeze-icons ; default icon set, required for tests kcalendarcore kcodecs kconfig @@ -780,11 +689,11 @@ calendaring applications.") kidentitymanagement kpimtextedit ktextwidgets - kwidgetsaddons - breeze-icons ; default icon set, required for tests - qtbase-5)) + ktexttemplate + kwidgetsaddons)) (arguments - `(#:tests? #f)) ;; TODO: seem to pull in some wrong theme + (list #:qtbase qtbase + #:tests? #f)) ;; TODO: seem to pull in some wrong theme (home-page "https://api.kde.org/kdepim/kcalutils/html/index.html") (synopsis "Library with utility functions for the handling of calendar data") @@ -795,14 +704,14 @@ functions for accessing calendar data using the kcalcore API.") (define-public kdepim-runtime (package (name "kdepim-runtime") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kdepim-runtime-" version ".tar.xz")) (sha256 - (base32 "1wvwibq6zzjlhh8yqrlqras0m8i01ynlwj9z6l3f0g0hyyz5nkw4")))) + (base32 "1jymvmiqbyl8qcff835sp6kw8w4lg4clm7p5cscfmcx6b9bg4w7l")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules dbus kdoctools libxslt shared-mime-info)) @@ -814,7 +723,6 @@ functions for accessing calendar data using the kcalcore API.") akonadi-notes boost cyrus-sasl - grantlee grantleetheme kcalendarcore kcalutils @@ -833,44 +741,43 @@ functions for accessing calendar data using the kcalcore API.") kldap kmbox kmime + kxmlgui knotifications knotifyconfig kpimcommon kpimtextedit - kross ktextwidgets kwallet kwindowsystem libkdepim libkgapi ;; TODO: libkolab - qca - qtbase-5 - qtdeclarative-5 - qtkeychain - qtnetworkauth-5 - qtspeech-5 - qtwebchannel-5 - qtwebengine-5 - qtxmlpatterns)) + qca-qt6 + qtdeclarative + qtkeychain-qt6 + qtnetworkauth + qtspeech + qtwebchannel + qtwebengine)) (arguments - ;; TODO: 5/45 tests fail for quite different reasons, even with - ;; "offscreen" and dbus - `(#:phases (modify-phases %standard-phases - (add-after 'set-paths 'extend-CPLUS_INCLUDE_PATH - (lambda* (#:key inputs #:allow-other-keys) - ;; FIXME: <Akonadi/KMime/SpecialMailCollections> is not - ;; found during one of the compilation steps without - ;; this hack. - (setenv "CPLUS_INCLUDE_PATH" - (string-append - (assoc-ref inputs "akonadi-mime") "/include/KF5:" - (or (getenv "CPLUS_INCLUDE_PATH") ""))))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - ;; FIXME: Atleast some appear to require network. - (invoke "dbus-launch" "ctest" "-E" "\ + ;; TODO: 5/45 tests fail for quite different reasons, even with + ;; "offscreen" and dbus + (list #:qtbase qtbase + #:phases #~(modify-phases %standard-phases + (add-after 'set-paths 'extend-CPLUS_INCLUDE_PATH + (lambda* (#:key inputs #:allow-other-keys) + ;; FIXME: <Akonadi/KMime/SpecialMailCollections> is not + ;; found during one of the compilation steps without + ;; this hack. + (setenv "CPLUS_INCLUDE_PATH" + (string-append + (assoc-ref inputs "akonadi-mime") "/include/KF6:" + (or (getenv "CPLUS_INCLUDE_PATH") ""))))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + ;; FIXME: Atleast some appear to require network. + (invoke "dbus-launch" "ctest" "-E" "\ (akonadi-sqlite-synctest|akonadi-sqlite-pop3test|storecompacttest\ |akonadi-sqlite-ewstest|ewsmoveitemrequest_ut|ewsdeleteitemrequest_ut\ |ewsgetitemrequest_ut|ewsunsubscriberequest_ut|ewssettings_ut\ @@ -890,24 +797,21 @@ package.") (define-public keventviews (package (name "keventviews") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/eventviews-" version ".tar.xz")) (sha256 - (base32 "1nh8a7jy0sjsyi41pxhxwjkq6fr4yy9rqgcjjbj01dnx1ykz3d7l")))) + (base32 "0kqkd8dqh8plmxngajr8266nad2sm7qf711h2jpiav753p0xas5z")))) (properties `((upstream-name . "eventviews"))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules qttools-5)) + (list extra-cmake-modules qttools)) (inputs - (list akonadi - akonadi-calendar - akonadi-contacts + (list akonadi-contacts boost - kcalendarcore kcalendarsupport kcalutils kcodecs @@ -928,8 +832,12 @@ package.") kservice ktextwidgets kxmlgui - libkdepim - qtbase-5)) + libkdepim)) + (propagated-inputs (list akonadi + akonadi-calendar + kcalendarcore + kcalendarsupport)) + (arguments (list #:qtbase qtbase)) (home-page "https://invent.kde.org/pim/eventviews") (synopsis "KDE PIM library for creating events") (description "This library provides an event creator for KDE PIM.") @@ -939,17 +847,18 @@ package.") (define-public kgpg (package (name "kgpg") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kgpg-" version ".tar.xz")) (sha256 - (base32 "1ihxw1s4sq7cp5pm6rddcmvqk0v5gfg4v38b6yg8hyjg655x63jz")))) + (base32 "10zhxkhjsbn2pfhq40ym8qp39adfqhdvcg1rm9hvf8k1c91lzpxk")))) (build-system qt-build-system) (arguments - (list #:phases + (list #:qtbase qtbase + #:phases #~(modify-phases %standard-phases (replace 'check (lambda* (#:key tests? #:allow-other-keys) @@ -969,8 +878,8 @@ package.") (list akonadi akonadi-contacts boost - gpgme - grantlee + breeze-icons ;; default icon set + gpgme-1.23 grantleetheme karchive kcodecs @@ -985,12 +894,11 @@ package.") kjobwidgets knotifications kservice + kstatusnotifieritem ktextwidgets kwidgetsaddons kwindowsystem - kxmlgui - breeze-icons ;; default icon set - qtbase-5)) + kxmlgui)) (home-page "https://apps.kde.org/kgpg/") (synopsis "Graphical front end for GNU Privacy Guard") (description "Kgpg manages cryptographic keys for the GNU Privacy Guard, @@ -1002,31 +910,33 @@ cryptography to the contents of the clipboard.") (define-public khealthcertificate (package (name "khealthcertificate") - (version "23.01.0") + (version "24.05.2") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/plasma-mobile/" version - "/khealthcertificate-" version ".tar.xz")) + (uri (string-append "mirror://kde/stable/release-service/" version + "/src/khealthcertificate-" version ".tar.xz")) (sha256 (base32 - "193agd3jg029vcq1h5hdg3gw6zgqcmszl6ffcrid0ajbbiic4pbm")))) + "0600rz72dd3x7wwj82cyixnch3v0m4gva5kgf3y6rzjzlqjdpx57")))) (build-system qt-build-system) (arguments - (list #:phases - #~(modify-phases %standard-phases - (replace 'check - (lambda* (#:key inputs tests? #:allow-other-keys) - (when tests? - (setenv "TZDIR" - (search-input-directory inputs "share/zoneinfo")) - (invoke "ctest" "-E" - "(icaovdsparsertest|eudgcparsertest)"))))))) + (list + #:qtbase qtbase + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key inputs tests? #:allow-other-keys) + (when tests? + (setenv "TZDIR" + (search-input-directory inputs "share/zoneinfo")) + (invoke "ctest" "-E" + "(icaovdsparsertest|eudgcparsertest)"))))))) (native-inputs (list extra-cmake-modules pkg-config tzdata-for-tests)) (inputs (list karchive kcodecs ki18n openssl - qtdeclarative-5 + qtdeclarative zlib)) (home-page "https://api.kde.org/khealthcertificate/html/index.html") (synopsis "Digital vaccination and recovery certificate library") @@ -1038,14 +948,14 @@ test and recovery certificates.") (define-public kidentitymanagement (package (name "kidentitymanagement") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kidentitymanagement-" version ".tar.xz")) (sha256 - (base32 "03bfz0x35wiynla39iysxa5g3rckmy9nj2z1f439v9sblcqbvz3p")))) + (base32 "026i17j6spl0937klzf9ch26cmj7rrp617yrdq7917cwp9i7ah04")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) @@ -1054,19 +964,20 @@ test and recovery certificates.") kcompletion kconfig kcoreaddons - kemoticons kiconthemes kio kpimtextedit ktextwidgets + ktextaddons kxmlgui - qtbase-5)) + kirigami-addons)) (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'check 'set-home - (lambda _ - (setenv "HOME" "/tmp/dummy-home")))))) ;; FIXME: what is this? + (list #:qtbase qtbase + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'set-home + (lambda _ + (setenv "HOME" "/tmp/dummy-home")))))) ;; FIXME: what is this? (home-page "https://kontact.kde.org/") (synopsis "Library for shared identities between mail applications") (description "This library provides an API for managing user identities.") @@ -1076,24 +987,25 @@ test and recovery certificates.") (define-public kimap (package (name "kimap") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kimap-" version ".tar.xz")) (sha256 - (base32 "08s2891f2cnf5f7q034lmqv3vnh3v61l7bsyssdx711jfbswg9ik")))) + (base32 "1q4nxd31sjml31qicgpinf81rd8id71wm3kgx0v9byv7d0kysyqn")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) (inputs (list cyrus-sasl kcoreaddons + kcodecs ki18n kio - kmime - qtbase-5)) + kmime)) + (arguments (list #:qtbase qtbase)) (home-page "https://api.kde.org/kdepim/kimap/html/index.html") (synopsis "Library for handling IMAP") (description "This library provides a job-based API for interacting with @@ -1107,23 +1019,26 @@ easier to do so.") (define-public kitinerary (package (name "kitinerary") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kitinerary-" version ".tar.xz")) (sha256 (base32 - "0fcqix7hgmv7qcfxzmqy61kg7dqi5zas5vqfs7pfycgcxma0g869")))) + "1c7dd85n1amyi9hdzfjlchcj156kfy64rw915bymcbvdy6y3m6ji")))) (build-system qt-build-system) (arguments - (list #:phases #~(modify-phases %standard-phases + (list #:qtbase qtbase + #:phases #~(modify-phases %standard-phases (replace 'check - (lambda* (#:key tests? #:allow-other-keys) + (lambda* (#:key inputs tests? #:allow-other-keys) (when tests? + (setenv "TZDIR" + (search-input-directory inputs "share/zoneinfo")) (invoke "dbus-launch" "ctest" "-E" - "(jsonlddocumenttest|mergeutiltest|locationutiltest|knowledgedbtest|airportdbtest|extractorscriptenginetest|pkpassextractortest|postprocessortest|calendarhandlertest|extractortest)"))))))) - (native-inputs (list dbus extra-cmake-modules)) + "(jsonlddocumenttest|mergeutiltest|locationutiltest|knowledgedbtest|airportdbtest|extractorscriptenginetest|pkpassextractortest|postprocessortest|calendarhandlertest|extractortest)"))))))) + (native-inputs (list dbus extra-cmake-modules tzdata-for-tests)) (inputs (list kpkpass kcalendarcore karchive @@ -1135,10 +1050,7 @@ easier to do so.") shared-mime-info openssl poppler - qtbase-5 - qtdeclarative-5 - qtlocation - qtquickcontrols2-5 + qtdeclarative libxml2 zlib zxing-cpp)) @@ -1152,21 +1064,22 @@ model and itinerary extraction code.") (define-public kldap (package (name "kldap") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kldap-" version ".tar.xz")) (sha256 - (base32 "0hp5j02kwh91xf0n6zqzgam7g50r54hzbkli5i7c0rxdb1g28ihm")))) + (base32 "1nhr18h7f4qm196jjg5aqyky7v7w8n7iy07kzdk638381sarcmyz")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules kdoctools)) (inputs - (list ki18n kio kwidgetsaddons qtbase-5 qtkeychain)) + (list ki18n kio kwidgetsaddons qtkeychain-qt6)) (propagated-inputs (list cyrus-sasl openldap)) + (arguments (list #:qtbase qtbase)) (home-page "https://api.kde.org/kdepim/kldap/html/index.html") (synopsis "Library for accessing LDAP") (description "This is a library for accessing LDAP with a convenient Qt @@ -1177,21 +1090,21 @@ protocol for querying and modifying directory services running over TCP/IP.") (define-public kleopatra (package (name "kleopatra") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kleopatra-" version ".tar.xz")) (sha256 - (base32 "0lcl20yihsa8dq0s24akp5z0290vh9nxjjjdwqk88nz8vmsr29i0")))) + (base32 "1jm0x73g2mfk6fc2m3smray8c9wddkk785aizxvq0yi4v52wydxb")))) (build-system qt-build-system) (native-inputs (list dbus extra-cmake-modules gnupg ;; TODO: Remove after gpgme uses fixed path kdoctools)) (inputs (list boost - gpgme + gpgme-1.23 kcmutils kcodecs kconfig @@ -1200,26 +1113,29 @@ protocol for querying and modifying directory services running over TCP/IP.") kcrash kdbusaddons ki18n + kio kiconthemes kitemmodels kmime knotifications ktextwidgets + kstatusnotifieritem kwidgetsaddons kwindowsystem kxmlgui libassuan libkleo + mimetreeparser breeze-icons ;; default icon set - qgpgme - qtbase-5)) + qgpgme-qt6-1.23)) (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "dbus-launch" "ctest"))))))) + (list #:qtbase qtbase + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "dbus-launch" "ctest"))))))) (home-page "https://apps.kde.org/kleopatra/") (synopsis "Certificate Manager and Unified Crypto GUI") (description "Kleopatra is a certificate manager and a universal crypto @@ -1231,14 +1147,14 @@ and retrieving certificates from LDAP servers.") (define-public kmail (package (name "kmail") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kmail-" version ".tar.xz")) (sha256 - (base32 "16gz0i7na1pkyly9jnvavyffkawxf5irr92rd50w68p01b82dhc6")))) + (base32 "0g30a36pd86brxq3ln709jnq9xdyqm8jiwwbv8kh70mcdbpjcpk2")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules dbus kdoctools)) @@ -1248,9 +1164,9 @@ and retrieving certificates from LDAP servers.") akonadi-mime akonadi-search boost - gpgme - grantlee + gpgme-1.23 grantleetheme + kaddressbook kbookmarks kcalendarcore kcalutils @@ -1271,6 +1187,7 @@ and retrieving certificates from LDAP servers.") kitemviews kjobwidgets kldap + kmail-account-wizard kmailcommon kmailtransport kmessagelib @@ -1282,6 +1199,7 @@ and retrieving certificates from LDAP servers.") kpimcommon kpimtextedit kservice + kstatusnotifieritem ksyntaxhighlighting ktextaddons ktextwidgets @@ -1296,21 +1214,36 @@ and retrieving certificates from LDAP servers.") libkleo libksieve breeze-icons ; default icon set, required for tests - qgpgme - qtbase-5 - qtdeclarative-5 - qtkeychain - qtwebchannel-5 - qtwebengine-5 + qgpgme-qt6-1.23 + qtdeclarative + qtkeychain-qt6 + qtwebchannel + qtwebengine sonnet)) (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "dbus-launch" "ctest" "-E" ;; FIXME: Many failing tests. - "(akonadi-sqlite-kmcomposerwintest|\ + (list + #:qtbase qtbase + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'wrap-program + (lambda* (#:key inputs #:allow-other-keys) + (define (find-program-directory name) + (dirname (search-input-file + inputs (string-append "/bin/" name)))) + (wrap-program (string-append #$output "/bin/kmail") + `("XDG_DATA_DIRS" ":" prefix + (,(getenv "XDG_DATA_DIRS"))) + `("PATH" ":" prefix + ,(map find-program-directory + (list "kaddressbook" + "akonadictl" + "accountwizard")))))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "dbus-launch" "ctest" "-E" ;; FIXME: Many failing tests. + "(akonadi-sqlite-kmcomposerwintest|\ +akonadi-sqlite-archivemailwidgettest|\ akonadi-sqlite-tagselectdialogtest|\ akonadi-sqlite-kmcommandstest|\ sendlateragent-sendlaterutiltest|\ @@ -1329,37 +1262,82 @@ manager from KDE.") (license ;; GPL for programs, LGPL for libraries, FDL for documentation (list license:gpl2+ license:lgpl2.0+ license:fdl1.2+)))) +(define-public kmail-account-wizard + (package + (name "kmail-account-wizard") + (version "24.05.2") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/release-service/" version + "/src/kmail-account-wizard-" version ".tar.xz")) + (sha256 + (base32 "0izjdajipca59zbsdir136qfyh61aynpb2h1bady6qs927l5ds1f")))) + (build-system qt-build-system) + (native-inputs + (list extra-cmake-modules shared-mime-info)) + (inputs + (list akonadi + akonadi-mime + kcrash + kcmutils + kdbusaddons + ki18n + kiconthemes + kidentitymanagement + kimap + kitemmodels + kldap + kmailtransport + kmime + knewstuff + knotifications + knotifyconfig + kpimcommon + kpimtextedit + ktextaddons + ktexteditor + kwallet + libkdepim + libkleo + qtkeychain-qt6)) + (arguments (list #:qtbase qtbase + ;; TODO: pass test. + #:tests? #f)) + (home-page "https://invent.kde.org/pim/kmail-account-wizard") + (synopsis "Assistant for the configuration of accounts in KMail") + (description + "This package provides an assistant for the configuration of accounts in +KMail.") + (license ;;GPL for programs, LGPL for libraries, FDL for documentation + (list license:gpl2+ license:lgpl2.0+ license:fdl1.2+)))) + (define-public kmailcommon (package (name "kmailcommon") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/mailcommon-" version ".tar.xz")) (sha256 - (base32 "165a0qf6i2862dpsw4wvgnxi4wv7hnc9s63fsf9jp6kbwwfw9nqv")))) + (base32 "0s23g08q5nx11vdpwxkqgzcs9xb6nycwsndfl6vpcnlbx10zsbfr")))) (properties `((upstream-name . "mailcommon"))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules dbus gnupg qttools-5)) + (list extra-cmake-modules dbus gnupg qttools)) (inputs - (list akonadi - akonadi-contacts - akonadi-mime + (list akonadi-contacts boost gpgme - grantlee grantleetheme karchive kcodecs - kcompletion kconfig kconfigwidgets kcontacts kdbusaddons - kdesignerplugin kguiaddons ki18n kiconthemes @@ -1371,9 +1349,7 @@ manager from KDE.") kldap kmailimporter kmailtransport - kmessagelib kmime - kpimcommon kpimtextedit ksyntaxhighlighting ktextaddons @@ -1382,16 +1358,22 @@ manager from KDE.") kwidgetsaddons kwindowsystem kxmlgui - libkdepim libkleo libxslt phonon qgpgme - qtwebchannel-5 - qtwebengine-5 - qtbase-5)) + qtwebchannel + qtwebengine)) + (propagated-inputs (list akonadi + akonadi-mime + kcompletion + kmessagelib + kpimcommon + libkdepim)) (arguments - `(#:tests? #f)) ;; TODO: 12/62 tests fail + (list + #:qtbase qtbase + #:tests? #f)) ;; TODO: 12/62 tests fail (home-page "https://invent.kde.org/pim/mailcommon") (synopsis "KDE email utility library") (description "The mail common library provides utility functions for @@ -1402,14 +1384,14 @@ dealing with email.") (define-public kmailimporter (package (name "kmailimporter") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/mailimporter-" version ".tar.xz")) (sha256 - (base32 "18shpxz7rg64g2mxdhdjhxhn893m0930v76cdnij339ycbcq5ypc")))) + (base32 "0hjwz70ys2bi6l8c2anzc7mhcapcqsximrxh813sp36hqwsix52g")))) (properties `((upstream-name . "mailimporter"))) (build-system qt-build-system) (native-inputs @@ -1418,10 +1400,8 @@ dealing with email.") (list akonadi akonadi-contacts akonadi-mime - grantlee grantleetheme boost - karchive kcompletion kconfig kconfigwidgets @@ -1438,8 +1418,9 @@ dealing with email.") ktextaddons ktextwidgets kxmlgui - libkdepim - qtbase-5)) + libkdepim)) + (propagated-inputs (list karchive)) + (arguments (list #:qtbase qtbase)) (home-page "https://invent.kde.org/pim/mailimporter") (synopsis "KDE mail importer library") (description "This package provides libraries for importing mails other @@ -1450,14 +1431,14 @@ e-mail client programs into KMail and KDE PIM.") (define-public kmailtransport (package (name "kmailtransport") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kmailtransport-" version ".tar.xz")) (sha256 - (base32 "14vmm9vla8i477jq40z73lc4klx6mm03y2xnljvx1v4inm3cpw2c")))) + (base32 "0ck6mr1zapk0ac96ffnps7pw5pzvb3d5v8lyjvv8acy3435j684z")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules kdoctools)) @@ -1479,10 +1460,11 @@ e-mail client programs into KMail and KDE PIM.") ktextwidgets kwallet libkgapi - qtbase-5 - qtkeychain)) + qtkeychain-qt6)) (arguments - `(#:tests? #f)) ;; TODO - 3/3 tests fail, require drkonqi + (list + #:qtbase qtbase + #:tests? #f)) ;; 1/2 tests fail, require network. (home-page "https://api.kde.org/kdepim/kmailtransport/html/index.html") (synopsis "Mail transport service library") (description "This library provides an API and support code for managing @@ -1492,19 +1474,20 @@ mail transport.") (define-public kmbox (package (name "kmbox") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kmbox-" version ".tar.xz")) (sha256 - (base32 "05hdfjwp6ay2j16rxp55k3fywwf7kxiig4dv9fh51iysglmzzn76")))) + (base32 "0g2pg80n37miinfv69mz6hpvdhhbprdvgbkvzafspaj9bram9xrr")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) (inputs - (list kcodecs kmime qtbase-5)) + (list kcodecs kmime)) + (arguments (list #:qtbase qtbase)) (home-page "https://api.kde.org/kdepim/kmbox/html/index.html") (synopsis "Library for handling mbox mailboxes") (description "This is a library for handling mailboxes in mbox format, @@ -1514,27 +1497,24 @@ using a Qt/KMime C++ API.") (define-public kmessagelib (package (name "kmessagelib") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/messagelib-" version ".tar.xz")) (sha256 - (base32 "0aqac0p46cwnr3qxjk0ivalfwjcgwy52s088wnk6ckp77m7r65is")))) + (base32 "1m7mah1zqfn9r3jw1lg303kg023lgl77r6if5g4ifv3lsih52pgl")))) (properties `((upstream-name . "messagelib"))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules gnupg libxml2)) (inputs - (list akonadi - akonadi-contacts - akonadi-mime + (list akonadi-contacts akonadi-notes akonadi-search boost - gpgme - grantlee + gpgme-1.23 grantleetheme karchive kcalendarcore @@ -1547,7 +1527,6 @@ using a Qt/KMime C++ API.") kguiaddons ki18n kiconthemes - kidentitymanagement kimap kio kitemmodels @@ -1556,40 +1535,43 @@ using a Qt/KMime C++ API.") kldap kmailtransport kmbox - kmime knewstuff knotifications - kpimcommon - kpimtextedit kservice ksyntaxhighlighting - ktextaddons ktextwidgets + ktexttemplate kwallet kwidgetsaddons kwindowsystem kxmlgui libgravatar - libkdepim - libkleo - qca - qgpgme - qtbase-5 - qtdeclarative-5 - qtwebchannel-5 - qtwebengine-5 + qca-qt6 + qgpgme-qt6-1.23 + qtdeclarative + qtwebchannel + qtwebengine sonnet)) + (propagated-inputs + (list akonadi + akonadi-mime + kidentitymanagement + kmime + kpimcommon + kpimtextedit + ktextaddons + libkdepim + libkleo)) (arguments - `(#:tests? #f ;TODO many test fail for quite different reasons - #:phases (modify-phases %standard-phases - (add-after 'set-paths 'extend-CPLUS_INCLUDE_PATH - (lambda* (#:key inputs #:allow-other-keys) - ;; FIXME: One of the compilation steps fail to find - ;; <QPrinter> without this hack. - (setenv "CPLUS_INCLUDE_PATH" - (string-append (assoc-ref inputs "qtbase") - "/include/qt5/QtPrintSupport:" - (or (getenv "CPLUS_INCLUDE_PATH") "")))))))) + (list #:qtbase qtbase + #:tests? #f ;TODO many test fail for quite different reasons + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'add-miss-PrintSupport + (lambda _ + (substitute* "webengineviewer/src/CMakeLists.txt" + (("KF6::ConfigCore") + "KF6::ConfigCore\n Qt::PrintSupport"))))))) (home-page "https://invent.kde.org/pim/messagelib") (synopsis "KDE PIM messaging libraries") (description "This package provides several libraries for messages, @@ -1601,29 +1583,28 @@ kwebengineviewer.") (define-public kmime (package (name "kmime") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kmime-" version ".tar.xz")) (sha256 - (base32 "1i38g0s98d24882kxyjay965nz3d3fjhb3mv1p4sllm2lnffrq2d")))) + (base32 "19dnp955vii3vi1jaxgbsyabbb35iaqvhz9nnz392r3wz7f3hbyq")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules)) + (list extra-cmake-modules tzdata-for-tests)) (inputs - (list kcodecs ki18n qtbase-5)) + (list kcodecs ki18n)) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-test-case - (lambda _ - ;; This is curious: autotests/CMakeLists.txt sets LC_TIME=C, but - ;; the Qt locale returns different. See kmime commit 3a9651d26a. - (substitute* "autotests/dateformattertest.cpp" - (("(Today|Yesterday) 12:34:56" line day) - (string-append day " 12:34 PM")))))))) + (list #:qtbase qtbase + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-test-case + (lambda* (#:key inputs tests? #:allow-other-keys) + (when tests? + (setenv "TZDIR" (search-input-directory + inputs "share/zoneinfo")))))))) (home-page "https://api.kde.org/stable/kdepimlibs-apidocs/") (synopsis "Library for handling MIME data") (description "This library provides an API for handling MIME @@ -1636,14 +1617,14 @@ information in non-ASCII character sets.") (define-public knotes (package (name "knotes") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/knotes-" version ".tar.xz")) (sha256 - (base32 "0f2a9xy2w909y792hwwnmsqvxx91azn6f0j0xl2mlmav00a4w6za")))) + (base32 "14nm2s86hqvvg0wyg8q5dd273dpppqw692h3mzya5mfg3j7acvaf")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules kdoctools libxslt)) @@ -1654,7 +1635,7 @@ information in non-ASCII character sets.") akonadi-notes akonadi-search boost - grantlee + breeze-icons ; default icon set, required for tests grantleetheme kcalendarcore kcalutils @@ -1679,16 +1660,16 @@ information in non-ASCII character sets.") kparts kpimcommon kpimtextedit + kstatusnotifieritem ktextaddons ktextwidgets + ktexttemplate kwidgetsaddons kwindowsystem kxmlgui kxmlgui - libkdepim - breeze-icons ; default icon set, required for tests - qtbase-5 - qtx11extras)) + libkdepim)) + (arguments (list #:qtbase qtbase)) (home-page "https://apps.kde.org/knotes/") (synopsis "Note-taking utility") (description "KNotes lets you write the computer equivalent of sticky @@ -1707,14 +1688,14 @@ Features: (define-public kontactinterface (package (name "kontactinterface") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kontactinterface-" version ".tar.xz")) (sha256 - (base32 "16fg24hz9vx912cffc94x5zx4jv3k72mbxgp5ck50lydypx6rfns")))) + (base32 "05g9mw29pi5z536pmxhavdispq5whgkx56iqqsdz8dy9rgjlm1bc")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) @@ -1725,8 +1706,8 @@ Features: kparts kwindowsystem kxmlgui - qtbase-5 - qtx11extras)) + libxkbcommon)) + (arguments (list #:qtbase qtbase)) (home-page "https://api.kde.org/kdepim/kontactinterface/html/index.html") (synopsis "Kontact interface library") (description "This library provides the glue necessary for @@ -1736,17 +1717,17 @@ application \"Parts\" to be embedded as a Kontact component (or plugin).") (define-public korganizer (package (name "korganizer") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/korganizer-" version ".tar.xz")) (sha256 - (base32 "1vp1jsmna059vvfj7xaj9fhhhq0lz9k0pphczkfbwm3gy6nzcavz")))) + (base32 "10walf46h1cnyfcpkppybgzlfcn93rygwppb4jfi2rg24rka3i84")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules dbus qttools-5 kdoctools tzdata-for-tests)) + (list extra-cmake-modules dbus qttools kdoctools tzdata-for-tests)) (inputs (list akonadi akonadi-calendar @@ -1755,7 +1736,6 @@ application \"Parts\" to be embedded as a Kontact component (or plugin).") akonadi-notes akonadi-search boost - grantlee grantleetheme kcalendarcore kcalendarsupport @@ -1795,17 +1775,18 @@ application \"Parts\" to be embedded as a Kontact component (or plugin).") kxmlgui libkdepim breeze-icons ; default icon set, required for tests - phonon - qtbase-5)) + phonon)) (arguments - '(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda* (#:key inputs tests? #:allow-other-keys) - (when tests? - (setenv "TZDIR" (search-input-directory - inputs "share/zoneinfo")) - (invoke "dbus-launch" "ctest"))))))) + (list #:qtbase qtbase + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key inputs tests? #:allow-other-keys) + (when tests? + (setenv "TZDIR" (search-input-directory + inputs "share/zoneinfo")) + (invoke "dbus-launch" "ctest" + "-E" "akonadi-sqlite-koeventpopupmenutest"))))))) (home-page "https://apps.kde.org/korganizer/") (synopsis "Organizational assistant, providing calendars and other similar functionality") @@ -1852,17 +1833,18 @@ Virtual Contact File}) files to the KPeople contact management library.") (define-public kpkpass (package (name "kpkpass") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version - "/src/kpkpass-" version ".tar.xz")) + "/src/kpkpass-" version ".tar.xz")) (sha256 (base32 - "1l3k33yzfjzarc2rpf576ib86ifzrfmsvpcdmv060dy0k8lbm1k9")))) + "1cqpmag3n58nzcbyb1rkkvwx9lzff1l8nawbqz2g1gqk2diny0wx")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) - (inputs (list karchive qtbase-5 shared-mime-info)) + (inputs (list karchive shared-mime-info)) + (arguments (list #:qtbase qtbase)) (home-page "https://invent.kde.org/pim/kpkpass") (synopsis "Apple Wallet Pass reader") (description "This package provides library to deal with Apple Wallet @@ -1872,18 +1854,18 @@ pass files.") (define-public kpimcommon (package (name "kpimcommon") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/pimcommon-" version ".tar.xz")) (sha256 - (base32 "1v2nv83h9p1ajbcwfdk8b7lrr84r8c855lysknzvzkpm5z012z3l")))) + (base32 "0k7zakx1dd39997a9a3d6qmlzdc5alw5gny0xh7bncv0fpilvgyh")))) (properties `((upstream-name . "pimcommon"))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules qttools-5)) + (list extra-cmake-modules qttools)) (inputs (list karchive akonadi @@ -1891,9 +1873,8 @@ pass files.") akonadi-mime akonadi-search boost - grantlee grantleetheme - ;; TODO: ("kaccounts" ,kaccounts) + kaccounts-integration kcalendarcore kcmutils kcodecs @@ -1901,10 +1882,8 @@ pass files.") kconfigwidgets kcontacts kcoreaddons - kdesignerplugin ki18n kiconthemes - kimap kio kirigami ;; run-time dependency kitemmodels @@ -1914,19 +1893,18 @@ pass files.") kmime knewstuff kpimtextedit - ktextaddons ktextwidgets + ktexttemplate kwallet kwidgetsaddons kwindowsystem kxmlgui - libkdepim libxslt purpose - qtbase-5 - qtwebengine-5)) + qtwebengine)) + (propagated-inputs (list kimap ktextaddons libkdepim)) (arguments - `(#:tests? #f)) ;; TODO tests hang + (list #:qtbase qtbase)) (home-page "https://invent.kde.org/pim/pimcommon") (synopsis "Common libraries for KDE PIM") (description "This package provides common libraries for KDE PIM.") @@ -1936,27 +1914,29 @@ pass files.") (define-public libgravatar (package (name "libgravatar") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/libgravatar-" version ".tar.xz")) (sha256 - (base32 "03zhnpb114y6a6vhiv9c1fiqsinjmk52j1k9w2r04ibxp35m3xj7")))) + (base32 "0xk6i1rndhh58p20hx6473hc29njg03qcy7ymdvflr5lgr7qavwy")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) (inputs (list kconfig ki18n kio + kconfigwidgets kpimcommon kpimtextedit ktextaddons ktextwidgets kwidgetsaddons - qtbase-5)) + qtbase)) (arguments - `(#:tests? #f)) ;; 2/7 tests fail (due to network issues?) + (list #:qtbase qtbase + #:tests? #f)) ;; 2/7 tests fail (due to network issues?) (home-page "https://invent.kde.org/pim/libgravatar") (synopsis "Online avatar lookup library") (description "This library retrieves avatar images based on a @@ -1968,24 +1948,22 @@ unnecessary network operations.") (define-public kpimtextedit (package (name "kpimtextedit") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kpimtextedit-" version ".tar.xz")) (sha256 - (base32 "1rrs19bwl8qvasridysbbgsgdy9hyjlpi26hw77hli5ixkflj85b")))) + (base32 "1m91hnjiksji60ybvmvlcgayqrcplxfdj7qxknxwayiijvqiq22a")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules qttools-5)) + (list extra-cmake-modules qttools)) (inputs - (list grantlee - kcodecs + (list kcodecs kconfigwidgets kcoreaddons - kdesignerplugin - kemoticons + ktextaddons ki18n kiconthemes kio @@ -1993,11 +1971,11 @@ unnecessary network operations.") ktextwidgets kwidgetsaddons kxmlgui - qtbase-5 - qtspeech-5 + qtspeech sonnet)) (arguments - `(#:tests? #f)) ;; TODO - test suite hangs + (list #:qtbase qtbase + #:tests? #f)) ;; TODO - test suite hangs (home-page "https://api.kde.org/kdepim/kpimtextedit/html/index.html") (synopsis "Library providing a textedit with PIM-specific features") (description "This package provides a textedit with PIM-specific features. @@ -2009,14 +1987,14 @@ text in the text edit to all kinds of markup, like HTML or BBCODE.") (define-public ksmtp (package (name "ksmtp") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/ksmtp-" version ".tar.xz")) (sha256 - (base32 "0pz17vmn38n2xl35d9di1b9138dh54wgyal9hx412nh123w13h12")))) + (base32 "1v7kami1f75gin7293kk07imkdnmvf9bfn49fc6lzbb52im4nh4b")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) @@ -2026,18 +2004,18 @@ text in the text edit to all kinds of markup, like HTML or BBCODE.") kconfig kcoreaddons ki18n - kio - qtbase-5)) + kio)) (arguments - `(#:tests? #f ;; TODO: does not find sasl mechs - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'Use-KDE_INSTALL_TARGETS_DEFAULT_ARGS-when-installing - (lambda _ - (substitute* "src/CMakeLists.txt" - (("^(install\\(.* )\\$\\{KF5_INSTALL_TARGETS_DEFAULT_ARGS\\}\\)" - _ prefix) - (string-append prefix "${KDE_INSTALL_TARGETS_DEFAULT_ARGS})")))))))) + (list #:qtbase qtbase + #:tests? #f ;; TODO: does not find sasl mechs + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'Use-KDE_INSTALL_TARGETS_DEFAULT_ARGS-when-installing + (lambda _ + (substitute* "src/CMakeLists.txt" + (("^(install\\(.* )\\$\\{KF5_INSTALL_TARGETS_DEFAULT_ARGS\\}\\)" + _ prefix) + (string-append prefix "${KDE_INSTALL_TARGETS_DEFAULT_ARGS})")))))))) (home-page "https://invent.kde.org/pim/ksmtp") (synopsis "Library for sending email through an SMTP server") (description "This library provides an API for handling SMTP @@ -2048,14 +2026,14 @@ standard protocols for e-mail transmission.") (define-public ktnef (package (name "ktnef") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/ktnef-" version ".tar.xz")) (sha256 - (base32 "00dkcmywjxzq5v2kp4klw50c3w74lmh16kbcwn8qd97kky3pd5ik")))) + (base32 "1v113fihnsn6iilk01rm8g68pm1gf1gdsvar2fiwhqsg48all588")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) @@ -2066,8 +2044,8 @@ standard protocols for e-mail transmission.") kconfig kcontacts kcoreaddons - ki18n - qtbase-5)) + ki18n)) + (arguments (list #:qtbase qtbase)) (home-page "https://api.kde.org/kdepim/ktnef/html/index.html") (synopsis "Library for handling mail attachments using TNEF format") (description "Ktnef is a library for handling data in the TNEF @@ -2080,17 +2058,17 @@ and allows one to view/extract message formatted text in Rich Text Format.") (define-public libkdepim (package (name "libkdepim") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/libkdepim-" version ".tar.xz")) (sha256 - (base32 "1i5c4qqd4ghlfjvxniy8sbfqh0fsrz4sadvh0n2d207s9rsl274v")))) + (base32 "1k22qjxfm8msj8ipyz2p5qq0hx9q6p3qw42cp3bnbhiaamanmlq3")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules qttools-5)) + (list extra-cmake-modules qttools)) (inputs (list akonadi akonadi-contacts @@ -2106,7 +2084,6 @@ and allows one to view/extract message formatted text in Rich Text Format.") kcontacts kcoreaddons kdbusaddons - kdesignerplugin ki18n kiconthemes kio @@ -2116,8 +2093,8 @@ and allows one to view/extract message formatted text in Rich Text Format.") kldap kmime kwallet - kwidgetsaddons - qtbase-5)) + kwidgetsaddons)) + (arguments (list #:qtbase qtbase)) (home-page "https://invent.kde.org/pim/libkdepim") (synopsis "Libraries for common KDE PIM apps") (description "This package provided libraries for common KDE PIM apps.") @@ -2127,17 +2104,17 @@ and allows one to view/extract message formatted text in Rich Text Format.") (define-public libkgapi (package (name "libkgapi") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/libkgapi-" version ".tar.xz")) (sha256 - (base32 "18jcrp7qi35zxzb4b7mn6519bjw47s7kwfahd6a50p40j17k09bs")))) + (base32 "0j0rbzwcjq4wjrrk0vhkifa8ahmmrpfy039fpf3gy237k5ncj5y3")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules qttools-5)) + (list extra-cmake-modules qttools)) (inputs (list cyrus-sasl ki18n @@ -2146,12 +2123,12 @@ and allows one to view/extract message formatted text in Rich Text Format.") kio kwallet kwindowsystem - qtbase-5 - qtdeclarative-5 - qtwebchannel-5 - qtwebengine-5)) + qtdeclarative + qtwebchannel + qtwebengine)) (arguments - `(#:tests? #f)) ;; TODO 6/48 tests fail + (list #:qtbase qtbase + #:tests? #f)) ;; TODO 6/48 tests fail (home-page "https://invent.kde.org/pim/libkgapi") (synopsis "Library for accessing various Google services via their public API") @@ -2162,20 +2139,20 @@ various Google services.") (define-public libkleo (package (name "libkleo") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/libkleo-" version ".tar.xz")) (sha256 - (base32 "0l77n4dlbv9hclzvh69kdzji907if7yayxiasxnnjkzsvcm1af25")))) + (base32 "102yszx6smyf2vd068p6j0921fql5jlmsra3n62xam81smqlpgj0")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules kdoctools qttools-5)) + (list extra-cmake-modules kdoctools qttools)) (inputs (list boost - gpgme + gpgme-1.23 kcodecs kcompletion kconfig @@ -2187,19 +2164,20 @@ various Google services.") kwidgetsaddons kwindowsystem kpimtextedit - qgpgme - qtbase-5)) + qgpgme-qt6-1.23)) (propagated-inputs - `(("gpgme" ,gpgme) - ("qgpgme" ,qgpgme))) + (list gpgme-1.23 qgpgme-qt6-1.23)) (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? ;; FIXME: These tests fail. - (invoke "ctest" "-E" - "(keyresolvercoretest|newkeyapprovaldialogtest)"))))))) + (list + #:qtbase qtbase + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? ;; FIXME: These tests fail. + (invoke "ctest" "-E" + "(expirycheckertest|keyresolvercoretest|\ +newkeyapprovaldialogtest)"))))))) (home-page "https://invent.kde.org/pim/libkleo") (synopsis "KDE PIM cryptographic library") (description "@code{libkleo} is a library for Kleopatra and other parts of @@ -2210,7 +2188,7 @@ KDE using certificate-based crypto.") (define-public libksieve (package (name "libksieve") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) @@ -2218,7 +2196,7 @@ KDE using certificate-based crypto.") "/src/libksieve-" version ".tar.xz")) (sha256 (base32 - "066z33v30h568bmdcsl4v478p3xhiwsmq7pr7kziilrhy3a2m7p6")))) + "1zsc84ylrylby28ypdg47kmf911dmi5hi6745wvjsrxcwnpqag37")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules kdoctools)) @@ -2226,6 +2204,7 @@ KDE using certificate-based crypto.") (list akonadi cyrus-sasl grantleetheme + kconfigwidgets karchive ki18n kiconthemes @@ -2243,24 +2222,125 @@ KDE using certificate-based crypto.") kwallet kwindowsystem libkdepim - qtbase-5 - qtdeclarative-5 - qtwebchannel-5 - qtwebengine-5)) + qtdeclarative + qtwebchannel + qtwebengine)) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'substitute - (lambda _ - ;; Disable a failing test - ;; sieveeditorhelphtmlwidgettest fails with `sigtrap` - (substitute* - "src/ksieveui/editor/webengine/autotests/CMakeLists.txt" - (("^\\s*(add_test|ecm_mark_as_test|set_tests_properties)\\W" line) - (string-append "# " line)))))))) + (list #:qtbase qtbase + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'substitute + (lambda _ + ;; Disable a failing test + ;; sieveeditorhelphtmlwidgettest fails with `sigtrap` + (substitute* + "src/ksieveui/editor/webengine/autotests/CMakeLists.txt" + (("^\\s*(add_test|ecm_mark_as_test|set_tests_properties)\\W" line) + (string-append "# " line)))))))) (home-page "https://invent.kde.org/pim/libksieve") (synopsis "KDE Sieve library") (description "Sieve is a language that can be used filter emails. KSieve is a Sieve parser and interpreter library for KDE.") (license ;; GPL for programs, LGPL for libraries (list license:gpl2+ license:lgpl2.0+)))) + +(define-public merkuro + (package + (name "merkuro") + (version "24.05.2") + (source (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/release-service/" + version "/src/" name "-" version + ".tar.xz")) + (sha256 + (base32 + "0n6na806g4xlx66ay0vk3iw9xs1h48ya7l0zpa3nqikr1by79lfh")))) + (build-system qt-build-system) + (arguments + (list #:qtbase qtbase + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "dbus-launch" "ctest"))))))) + (native-inputs (list dbus extra-cmake-modules)) + (inputs (list akonadi + akonadi-contacts + akonadi-mime + breeze-icons + gpgme + grantleetheme + kio + kirigami + kirigami-addons + kdbusaddons + ki18n + kimap + kcalendarcore + kcalendarsupport + kconfigwidgets + kwindowsystem + kcoreaddons + kcontacts + kitemmodels + kmailcommon + kmailtransport + kmessagelib + kmime + kidentitymanagement + kpimcommon + kpimtextedit + ktextaddons + ktextwidgets + akonadi-calendar + akonadi-mime + keventviews + kcalutils + kxmlgui + kiconthemes + libkdepim + libkleo + mimetreeparser + qtdeclarative + qtsvg + qqc2-desktop-style + qtwebengine)) + (home-page "https://apps.kde.org/kalendar/") + (synopsis "Calendar application") + (description + "Merkuro is a calendar application using Akonadi to sync with +external services. + +NOTE: plsase add akonadi and kdepim-runtime to system package.") + (license license:gpl3+))) + +(define-public mimetreeparser + (package + (name "mimetreeparser") + (version "24.05.2") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/release-service/" version + "/src/mimetreeparser-" version ".tar.xz")) + (sha256 + (base32 "132slwaqlaxnbvkpqb9w4ak4mpkrvw6ln81nbka91c3ngcamfac9")))) + (build-system qt-build-system) + (native-inputs + (list extra-cmake-modules)) + (inputs + (list kcalendarcore kcodecs libkleo kwidgetsaddons qtdeclarative)) + (propagated-inputs (list ki18n kmime kmbox)) + (arguments + (list #:tests? #f ;; FIXME: 7/9 tests fail. + #:qtbase qtbase)) + (home-page "https://kontact.kde.org") + (synopsis "Parser for MIME trees") + (description "This package provides a parser for a MIME tree and is based +on KMime. The goal is given a MIME tree to extract a list of parts and a list +of attachments, check the validity of the signatures and decrypt any encrypted +part.") + (license license:lgpl2.0+))) diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm index a1c17d3346..5c7bbee717 100644 --- a/gnu/packages/kde-plasma.scm +++ b/gnu/packages/kde-plasma.scm @@ -39,16 +39,22 @@ #:use-module (gnu packages authentication) #:use-module (gnu packages bash) #:use-module (gnu packages compression) + #:use-module (gnu packages crypto) + #:use-module (gnu packages cups) #:use-module (gnu packages display-managers) + #:use-module (gnu packages file-systems) #:use-module (gnu packages firmware) + #:use-module (gnu packages fonts) #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) + #:use-module (gnu packages gdb) #:use-module (gnu packages ghostscript) #:use-module (gnu packages gnupg) #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gtk) + #:use-module (gnu packages hardware) #:use-module (gnu packages ibus) #:use-module (gnu packages icu4c) #:use-module (gnu packages iso-codes) @@ -69,46 +75,56 @@ #:use-module (gnu packages polkit) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) + #:use-module (gnu packages python-xyz) #:use-module (gnu packages package-management) ; flatpak + #:use-module (gnu packages rdesktop) #:use-module (gnu packages unicode) #:use-module (gnu packages video) #:use-module (gnu packages vpn) #:use-module (gnu packages vulkan) + #:use-module (gnu packages wm) #:use-module (gnu packages textutils) #:use-module (gnu packages qt) #:use-module (gnu packages xdisorg) + #:use-module (gnu packages xml) #:use-module (gnu packages xorg) #:use-module (gnu packages base) #:use-module (gnu packages gps) #:use-module (gnu packages web) + #:use-module (gnu packages tls) + #:use-module (gnu packages xml) #:use-module (gnu packages opencl)) (define-public bluedevil (package (name "bluedevil") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "0ddzcarn06rvhbmvm9x737ba9ycxcvg030892nh6izgfrjlaxhfb")))) + "1ss1xdrpq9yjcic9xmr6x3j5slj5l4mjw381fsgdb5sf7s0ypy9b")))) (build-system qt-build-system) - (native-inputs (list extra-cmake-modules pkg-config qttools-5)) + (arguments (list #:qtbase qtbase)) + (native-inputs (list extra-cmake-modules pkg-config qttools)) (inputs (list kcoreaddons kcmutils + kirigami kwidgetsaddons kdbusaddons + kjobwidgets + ksvg knotifications kwindowsystem - plasma-framework + libplasma ki18n kio kdeclarative bluez-qt shared-mime-info - qtdeclarative-5)) + qtdeclarative)) (synopsis "Manage the Bluetooth settings from Plasma") (description "This package provides Bluetooth manager for Plasma Shell.") @@ -118,26 +134,16 @@ (define-public breeze (package (name "breeze") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "1wfclkg4d3wraz19kwpm87vwp9327s5y8n1a42qgrdh980qwzzdz")))) + "1kvx8ynb5m66m1zdrfk5bzpjs879sl8m1ap914199i21v58dqmnl")))) (build-system qt-build-system) - ;; TODO: Warning at /gnu/store/…-kpackage-5.34.0/…/KF5PackageMacros.cmake: - ;; warnings during generation of metainfo for org.kde.breezedark.desktop: - ;; Package type "Plasma/LookAndFeel" not found - ;; TODO: Check whether is makes sence splitting into several outputs, like - ;; Debian does: - ;; - breeze-cursor-theme - ;; - "out", "devel" - ;; - kde-style-breeze - Widget style - ;; - kde-style-breeze-qt4 - propably not useful - ;; - kwin-style-breeze - ;; - qml-module-qtquick-controls-styles-breeze - QtQuick style + ;; TODO: Check whether is makes sence splitting into several outputs. (native-inputs (list extra-cmake-modules pkg-config)) (inputs @@ -149,23 +155,38 @@ kguiaddons ki18n kirigami - kiconthemes ; for optional kde-frameworkintegration + kiconthemes kpackage - kwayland ; optional kwindowsystem - qtbase-5 - qtdeclarative-5 ; optional - qtx11extras)) + kcolorscheme)) + (arguments (list #:qtbase qtbase + #:configure-flags #~(list "-DBUILD_QT5=OFF"))) (home-page "https://invent.kde.org/plasma/breeze") (synopsis "Default KDE Plasma theme") (description "Artwork, styles and assets for the Breeze visual style for the Plasma Desktop. Breeze is the default theme for the KDE Plasma desktop.") (license license:gpl2+))) +(define-public breeze-qt5 + (package + (inherit breeze) + (name "breeze-qt5") + (inputs + (list kcmutils-5 ; optional + kconfigwidgets-5 + kcoreaddons-5 + kguiaddons-5 + ki18n-5 + kirigami-5 + kiconthemes-5 + kpackage-5 + kwindowsystem-5)) + (arguments (list #:configure-flags #~(list "-DBUILD_QT6=OFF"))))) + (define-public breeze-gtk (package (name "breeze-gtk") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -173,10 +194,12 @@ the Plasma Desktop. Breeze is the default theme for the KDE Plasma desktop.") "-" version ".tar.xz")) (sha256 (base32 - "1s2qv51qa867b0bf29b7j90yzqmn3s2dwblczsb79h2i1gnr8ci9")))) + "04gcrbf5b53sqk3ybwwqzbqah04ag03wcplahqw997kgxdqd37sv")))) (build-system qt-build-system) (arguments - '(#:tests? #f)) ;no 'test' target + (list + #:qtbase qtbase + #:tests? #f)) ;no 'test' target (native-inputs (list breeze extra-cmake-modules sassc python python-pycairo)) (home-page "https://invent.kde.org/plasma/breeze") @@ -189,16 +212,16 @@ Breeze is the default theme for the KDE Plasma desktop.") (define-public calindori (package (name "calindori") - (version "23.01.0") + (version "24.05.2") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/plasma-mobile/" version - "/calindori-" version ".tar.xz")) + (uri (string-append "mirror://kde/stable/release-service/" version + "/src/calindori-" version ".tar.xz")) (sha256 (base32 - "0jhrxsh6gd20qpq68n2lspfkgq3bam46j6m10jnm3zckb190pfhl")))) + "1x3890naijhiyh6ppf3bs5hc3hgcljf0va4kd2gj0s3fdddrqh7i")))) (build-system qt-build-system) - (native-inputs (list extra-cmake-modules)) + (native-inputs (list extra-cmake-modules python-minimal)) (inputs (list kconfig kcoreaddons kdbusaddons @@ -207,11 +230,9 @@ Breeze is the default theme for the KDE Plasma desktop.") kcalendarcore knotifications kpeople - qtbase-5 - qtdeclarative-5 - qtquickcontrols2-5 - qtsvg-5 - qtgraphicaleffects)) + qtdeclarative + qtsvg)) + (arguments (list #:qtbase qtbase)) (home-page "https://invent.kde.org/plasma-mobile/calindori") (synopsis "Calendar for Plasma Mobile") (description @@ -221,7 +242,7 @@ Breeze is the default theme for the KDE Plasma desktop.") (define-public discover (package (name "discover") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -233,10 +254,11 @@ Breeze is the default theme for the KDE Plasma desktop.") ".tar.xz")) (sha256 (base32 - "0025g1whq8z1s5915jhq83xsiz4klzqpayfzqkar8c6gni5s3v59")))) + "16awva2q379z3rpiqlj7dby03k19d9c3d45y0vz5yd8lpavb9a3f")))) (build-system qt-build-system) (arguments - (list #:phases + (list #:qtbase qtbase + #:phases #~(modify-phases %standard-phases (add-before 'configure 'set-LDFLAGS (lambda _ @@ -247,10 +269,13 @@ Breeze is the default theme for the KDE Plasma desktop.") (when tests? (invoke "ctest" "-E" "knsbackendtest"))))))) (native-inputs (list extra-cmake-modules pkg-config)) - (inputs (list appstream-qt + (inputs (list appstream-qt6 attica fwupd ; optional flatpak ; optional + kauth + kiconthemes + kstatusnotifieritem kcoreaddons kconfig kcrash @@ -259,6 +284,7 @@ Breeze is the default theme for the KDE Plasma desktop.") karchive kxmlgui kirigami + kirigami-addons kuserfeedback knewstuff knotifications @@ -266,11 +292,10 @@ Breeze is the default theme for the KDE Plasma desktop.") kdeclarative kcmutils kidletime - packagekit-qt5 + packagekit-qt6 purpose - qtdeclarative-5 - qtgraphicaleffects - qtquickcontrols2-5)) + qtdeclarative + qcoro-qt6)) ;; -- The following features have been disabled: ;; * Ostree, Library to manage ostree repository. Required to build the rpm-ostree backend ;; * RpmOstree, rpm-ostree binary to manage the system. Required to build the rpm-ostree backend @@ -288,7 +313,7 @@ games, and tools.") (define-public drkonqi (package (name "drkonqi") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -296,21 +321,43 @@ games, and tools.") version ".tar.xz")) (sha256 (base32 - "1li1j85yvg2nj392rl1jmdqx3mzmrdj0lf72j37xd8r2bi0ic9z8")))) + "19965cim06lfmkaansmrx814axfz7fxsmgfl52x2q3ar5vrmn05a")))) (build-system qt-build-system) (arguments - (list #:phases #~(modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "ctest" "-E" "connectiontest"))))))) - (native-inputs (list extra-cmake-modules)) + (list #:qtbase qtbase + #:configure-flags + #~(list "-DCMAKE_DISABLE_FIND_PACKAGE_Systemd=TRUE" + "-DWITH_GDB12=TRUE" + "-DWITH_PYTHON_VENDORING=FALSE") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'set-gdb-path + (lambda* (#:key inputs #:allow-other-keys) + (let ((gdb (search-input-file inputs "/bin/gdb"))) + (substitute* "src/data/debuggers/internal/gdbrc" + (("TryExec=gdb") + (string-append "TryExec=" gdb "\n" + "CodeName=gdb")) + (("(Exec|ExecWithSymbolResolution)=gdb" _ letters) + (string-append letters "=" gdb)))))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "ctest" "-E" "(connectiontest|preambletest)")))) + (add-after 'install 'wrap-program + (lambda _ + (wrap-program (string-append #$output + "/libexec/drkonqi") + `("GUIX_PYTHONPATH" ":" prefix + (,(getenv "GUIX_PYTHONPATH"))))))))) + (native-inputs (list extra-cmake-modules pkg-config)) (inputs (list ki18n kcoreaddons kconfig kservice kdeclarative kjobwidgets + kstatusnotifieritem kio kcrash kcompletion @@ -319,9 +366,20 @@ games, and tools.") knotifications kidletime kwindowsystem + qtdeclarative + kuserfeedback + + python-minimal + python-pygdbmi + python-chai + python-psutil + python-sentry-sdk + gdb + ;; qml module runtime dependency ksyntaxhighlighting - qtdeclarative-5 - kuserfeedback)) + kcmutils + kitemmodels + kirigami)) (synopsis "Crash handler for KDE software") (description "This package provides an automatic handler for crashed apps.") (home-page "https://invent.kde.org/plasma/drkonqi") @@ -330,7 +388,7 @@ games, and tools.") (define-public kactivitymanagerd (package (name "kactivitymanagerd") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -338,13 +396,12 @@ games, and tools.") version ".tar.xz")) (sha256 (base32 - "1d7vz8gwqa7nhfn62dsqircm0qbp9ryass82k2891mqj0qrlbwid")))) + "1zfaqaw50qr0s2shm2vxfbzvys2jp2s7hqgq8n928cily37wz8h8")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules)) (inputs (list boost - kconfig - kcoreaddons - kwindowsystem + kcompletion kglobalaccel kio kxmlgui @@ -357,28 +414,81 @@ concept.") (home-page "https://invent.kde.org/plasma/kactivitymanagerd") (license (list license:gpl2 license:gpl3)))) +(define-public krdp + (package + (name "krdp") + (version "6.1.2") + (source (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/plasma/" + version "/" name "-" + version ".tar.xz")) + (sha256 + (base32 + "0xp1zi51fpw9zcyry6g8qrm7k94pbi6kw3d8dakdnq5qrkcsvc8g")))) + (build-system qt-build-system) + (arguments (list #:qtbase qtbase + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'hardcode-openssl + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/kcm/kcmkrdpserver.cpp" + (("\"openssl\"") + (string-append + "\"" + (search-input-file + inputs "/bin/openssl") + "\"")))))))) + (native-inputs (list extra-cmake-modules + pkg-config + ;; for wayland-scanner + wayland)) + (inputs (list + kconfig + kdbusaddons + kcmutils + ki18n + kcoreaddons + kstatusnotifieritem + kpipewire + openssl + plasma-wayland-protocols + freerdp + qtwayland + qtdeclarative + qtkeychain-qt6 + wayland-protocols + wayland)) + (synopsis "Library and examples for creating an RDP server") + (description "This package provides a library and examples for creating an +RDP server.") + (home-page "https://invent.kde.org/plasma/krdp") + (license license:lgpl2.0+))) + (define-public kde-gtk-config (package (name "kde-gtk-config") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/kde-gtk-config-" version ".tar.xz")) (sha256 (base32 - "13qwj3gdfvs0l6k01n8hf25kzrsksi3qi0b1rzpshcj1ix31wamf")))) + "099n4dyyqirjm8ixgl3ifiral3jb2ivg74gzfv2xmfgj0cjwszza")))) (build-system qt-build-system) (arguments - (list #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'patch-gsettings-schemas-path - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "cmake/modules/FindGSettingSchemas.cmake" - (("\\$\\{PC_GLIB2_PREFIX\\}") - (assoc-ref inputs "gsettings-desktop-schemas")))))))) + (list + #:qtbase qtbase + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-gsettings-schemas-path + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "cmake/modules/FindGSettingSchemas.cmake" + (("\\$\\{PC_GLIB2_PREFIX\\}") + (assoc-ref inputs "gsettings-desktop-schemas")))))))) (native-inputs - (list extra-cmake-modules pkg-config qtsvg-5 sassc)) + (list extra-cmake-modules pkg-config qtsvg sassc)) (inputs (list gsettings-desktop-schemas gtk+ @@ -399,19 +509,20 @@ applications.") (define-public kdecoration (package (name "kdecoration") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/kdecoration-" version ".tar.xz")) (sha256 (base32 - "153j3w00zwj6gx9ndq46vkfwx3ayig80j0jsqbkajk8zsncs89pg")))) + "1gmyxp3gk47rci4xdlgsdbp9wa2zx2790pqv1z4y7zmwg395vs41")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules)) (inputs - (list kcoreaddons ki18n qtbase-5)) + (list kcoreaddons ki18n)) (home-page "https://invent.kde.org/plasma/kdecoration") (synopsis "Plugin based library to create window decorations") (description "KDecoration is a library to create window decorations. @@ -422,7 +533,7 @@ manager which re-parents a Client window to a window decoration frame.") (define-public kde-cli-tools (package (name "kde-cli-tools") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -430,10 +541,11 @@ manager which re-parents a Client window to a window decoration frame.") (patches (search-patches "kde-cli-tools-delay-mime-db.patch")) (sha256 (base32 - "1br1i8ba4n7d2yl618ph4glsaasn3rxy4kjp48f12l9l2pk29nxa")))) + "06vms60wrddj9b8bagk5xhwjff4pi81vxs0zja8mk5fscv0750bi")))) (build-system qt-build-system) (arguments - (list #:tests? #f ;TODO: Failing 1 test + (list #:qtbase qtbase + #:tests? #f ;TODO: Failing 1 test #:phases #~(modify-phases %standard-phases (add-after 'unpack 'set-writable-location @@ -444,13 +556,7 @@ GenericDataLocation.") (string-append "\"" (getcwd) "/\""))))) (add-before 'check 'setup-env (lambda* _ - (setenv "HOME" (getcwd)))) - (add-after 'install 'symlink-kdesu - (lambda _ - ;; XXX: nixpkgs say kdesu need kdeinit5 in PATH, but i can't - ;; found in source, need check - (symlink (string-append #$output "/libexec/kf5/kdesu") - (string-append #$output "/bin/kdesu"))))))) + (setenv "HOME" (getcwd))))))) (native-inputs (list extra-cmake-modules pkg-config shared-mime-info)) (inputs (list kconfig kdesu @@ -461,11 +567,11 @@ GenericDataLocation.") kio kservice kwindowsystem - kactivities + plasma-activities kparts plasma-workspace - qtx11extras - qtsvg-5)) + qtsvg + libxkbcommon)) (synopsis "CLI tools for interacting with KDE") (description "This package provides command-line tools based on KDE Frameworks 5 to better interact with the system.") @@ -475,17 +581,18 @@ KDE Frameworks 5 to better interact with the system.") (define-public kdeplasma-addons (package (name "kdeplasma-addons") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "0l7g4lx6y10xfabfcgvh7zb7h08clj0g9yx8ajyg7rzwfa43visi")))) + "1q8jhj9b9sj7bdkr0bvk4grjjrylq86svwvr96knnpicxbjf633c")))) (build-system qt-build-system) (arguments - (list #:phases #~(modify-phases %standard-phases + (list #:qtbase qtbase + #:phases #~(modify-phases %standard-phases (replace 'check (lambda* (#:key tests? inputs #:allow-other-keys) @@ -497,23 +604,29 @@ KDE Frameworks 5 to better interact with the system.") "(converterrunnertest)"))))))) (native-inputs (list extra-cmake-modules tzdata-for-tests)) (inputs (list karchive + kauth kconfig kcoreaddons kdeclarative + kdbusaddons kholidays ki18n kio kcmutils + kglobalaccel + kxmlgui knotifications krunner kservice kunitconversion knewstuff - plasma-framework + libplasma + plasma5support purpose sonnet - ;; qtwebengine-5 ; Optional for online dictionary - qtdeclarative-5)) + qt5compat + ;; qtwebengine ; Optional for online dictionary + qtdeclarative)) (synopsis "Add-ons to improve your Plasma experience") (description "This package provides multiple addons for the Plasma Desktop.") @@ -523,119 +636,136 @@ KDE Frameworks 5 to better interact with the system.") (define-public kgamma (package (name "kgamma") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" - version "/" name "5-" + version "/" name "-" version ".tar.xz")) (sha256 (base32 - "0v5fynydjha9wx9j59ysw8vxx2h2gm55q27gnnhgyv0wxva8hpnl")))) + "0qr6crka2a71izg54vz0y7ahsfxr7xh1j3bb53c7pfhs3dq8wgfb")))) (build-system qt-build-system) - (native-inputs (list extra-cmake-modules)) + (arguments (list #:qtbase qtbase)) + (native-inputs (list extra-cmake-modules kdoctools)) (inputs (list kauth kcoreaddons kconfig kconfigwidgets - kdoctools + kcmutils ki18n)) (synopsis "Adjust monitor gamma settings") (description "This package provides a tool to adjust your monitor gamma settings.") (home-page "https://invent.kde.org/plasma/kgamma5") - (properties '((upstream-name . "kgamma5"))) (license license:gpl2+))) -(define-public khotkeys +(define-public kglobalacceld (package - (name "khotkeys") - (version "5.27.7") + (name "kglobalacceld") + (version "6.1.2") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/plasma/" version "/" - name "-" version ".tar.xz")) + (uri (string-append "mirror://kde/stable/plasma/" + version "/" name "-" + version ".tar.xz")) (sha256 (base32 - "1ipg71jz356jrngw7kqbjs7jplpnr8q3yz694rkhqklsqlfh91bd")))) + "1p38lqiw9r1w6grp5847pm9lh27d765in62fnc2vlrkb99krxcr7")))) (build-system qt-build-system) - (native-inputs (list extra-cmake-modules)) - (inputs (list kdbusaddons - kdoctools + (arguments (list #:qtbase qtbase + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'setenv + (lambda _ + (setenv "HOME" (getcwd)))) + (replace 'check + (lambda* (#:key tests? parallel-tests? #:allow-other-keys) + (invoke "dbus-launch" "ctest" "-j" + (if parallel-tests? + (number->string (parallel-job-count)) + "1"))))))) + (native-inputs (list extra-cmake-modules dbus)) + (inputs (list kconfig + kcoreaddons + kcrash + kdbusaddons + kwindowsystem kglobalaccel - ki18n - kcmutils + kservice kio - ktextwidgets - kxmlgui - kdelibs4support - plasma-workspace - qtx11extras)) - (synopsis "Trigger actions with the keyboard") + kjobwidgets + xcb-util-keysyms + libxkbcommon)) + (synopsis "Daemon providing Global Keyboard Shortcut (Accelerator) +functionality") (description - "This package provides a way to trigger actions when certain keys -are pressed.") - (home-page "https://invent.kde.org/plasma/khotkeys") - (license license:lgpl2.0))) + "This package provides a Daemon providing Global Keyboard Shortcut +(Accelerator) functionality.") + (home-page "https://invent.kde.org/plasma/kglobalacceld") + (license license:gpl2+))) (define-public kinfocenter (package (name "kinfocenter") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "15hm828ifrrzsbkvknqwf0l3qxr45pdi49z823cw421z45r8ivkj")))) + "0g5hvsgj7v1zc5kavq6kr44rnf2gzk719wsaypdj8cqy8nijph31")))) (build-system cmake-build-system) (arguments - (list #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'fix-systemsettings-symlink - (lambda* (#:key inputs #:allow-other-keys) - (let ((replace (lambda (file cmd) - (substitute* file - (((string-append - "\"" - cmd - "\"")) - (string-append - "\"" - (search-input-file - inputs - (string-append "/bin/" cmd)) - "\"")))))) - (substitute* "CMakeLists.txt" - (("\\$\\{KDE_INSTALL_FULL_BINDIR\\}/systemsettings5") - (search-input-file inputs - "/bin/.systemsettings5-real"))) - (substitute* "Modules/kwinsupportinfo/kcm_kwinsupportinfo.json.in" - (("@QtBinariesDir@/qdbus") - (search-input-file inputs "/bin/qdbus"))) - (substitute* "Modules/kwinsupportinfo/main.cpp" - (("QLibraryInfo::location\\(QLibraryInfo::BinariesPath\\) \\+ QStringLiteral\\(\"/qdbus\"\\)") - (string-append "QStringLiteral(\"" (search-input-file inputs "/bin/qdbus") "\")"))) - - (replace '("Modules/cpu/kcm_cpu.json" - "Modules/cpu/main.cpp") "lscpu") - (replace '("Modules/opencl/kcm_opencl.json" - "Modules/opencl/main.cpp") "clinfo") - (replace '("Modules/vulkan/kcm_vulkan.json" - "Modules/vulkan/main.cpp") "vulkaninfo") - (replace '("Modules/glx/kcm_glx.json" - "Modules/glx/main.cpp") "glxinfo") - (replace '("Modules/wayland/kcm_wayland.json" - "Modules/wayland/main.cpp") "wayland-info") - (replace '("Modules/egl/kcm_egl.json" - "Modules/egl/main.cpp") "eglinfo") - (replace '("Modules/xserver/kcm_xserver.json" - "Modules/xserver/main.cpp") "xdpyinfo"))))))) - (native-inputs (list aha extra-cmake-modules kdoctools pkg-config)) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'set-path + (lambda* (#:key inputs #:allow-other-keys) + (let ((replace (lambda (file cmd) + (substitute* file + (((string-append + "\"" + cmd + "\"")) + (string-append + "\"" + (search-input-file + inputs + (string-append "/bin/" cmd)) + "\"")))))) + (substitute* "CMakeLists.txt" + (("\\$\\{KDE_INSTALL_FULL_BINDIR\\}/systemsettings") + (search-input-file inputs + "/bin/.systemsettings-real"))) + (substitute* "kcms/kwinsupportinfo/kcm_kwinsupportinfo.json.in" + (("@QtBinariesDir@/qdbus") + (search-input-file inputs "/bin/qdbus"))) + (substitute* "kcms/kwinsupportinfo/main.cpp" + (("QLibraryInfo::path\\(QLibraryInfo::BinariesPath\\) \\+ QStringLiteral\\(\"/qdbus\"\\)") + (string-append "QStringLiteral(\"" (search-input-file inputs "/bin/qdbus") "\")"))) + + (replace '("kcms/cpu/kcm_cpu.json" + "kcms/cpu/main.cpp") "lscpu") + (replace '("kcms/opencl/kcm_opencl.json" + "kcms/opencl/main.cpp") "clinfo") + (replace '("kcms/vulkan/kcm_vulkan.json" + "kcms/vulkan/main.cpp") "vulkaninfo") + (replace '("kcms/glx/kcm_glx.json" + "kcms/glx/main.cpp") "glxinfo") + (replace '("kcms/wayland/kcm_wayland.json" + "kcms/wayland/main.cpp") "wayland-info") + (replace '("kcms/egl/kcm_egl.json" + "kcms/egl/main.cpp") "eglinfo") + (replace '("kcms/xserver/kcm_xserver.json" + "kcms/xserver/main.cpp") "xdpyinfo"))))))) + (native-inputs (list aha extra-cmake-modules kdoctools pkg-config qttools)) ;; * vulkaninfo ;; Wayland KCM (inputs (list dmidecode ;; fwupdmgr ;; Packaged on master branch already + kauth kconfig kconfigwidgets kcoreaddons @@ -651,14 +781,14 @@ are pressed.") kwayland mesa-utils pciutils - plasma-framework - qtbase-5 + libplasma + qttools + qtbase solid util-linux vulkan-tools wayland-utils xdpyinfo - qttools-5 clinfo)) (propagated-inputs (list system-settings)) (home-page "https://invent.kde.org/plasma/kinfocenter") @@ -670,7 +800,7 @@ computer's hardware.") (define-public kmenuedit (package (name "kmenuedit") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -678,8 +808,9 @@ computer's hardware.") ".tar.xz")) (sha256 (base32 - "0n60z44wbsjinrcrhs5cfnjs9szpsv2wzva2fiwwgh36j6zz5av7")))) + "0wypmw265n8ni6i0hgb60fmaa5m5v759kwwh9pybc3hw81wb8m4l")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs (list ki18n kxmlgui @@ -736,25 +867,33 @@ the schedule and venue information.") (define-public kpipewire (package (name "kpipewire") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "10j7sa8vv530c388z5rzafkdr4sx3agjqczlnkh7412whyw77lha")))) + "0wfmf28w2fmv1fx02azv6k2k5xkqz3j8jpxgnpgizdrzf9fm03r5")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules pkg-config)) - (propagated-inputs (list libepoxy pipewire qtbase-5 qtdeclarative-5)) - (inputs (list ffmpeg + (propagated-inputs (list qtbase qtdeclarative + ;; include/KPipeWire/dmabufhandler.h include it. + libepoxy)) + (inputs (list libxkbcommon + libva + pipewire + ffmpeg kcoreaddons ki18n kwayland plasma-wayland-protocols - qtwayland-5 + qtwayland wayland wayland-protocols)) + (arguments + ;; The only test require run pipewire. + (list #:tests? #f)) (home-page "https://invent.kde.org/plasma/kpipewire") (synopsis "Components relating to pipewire use in Plasma") (description "This package offers a set of convenient classes to use @@ -765,7 +904,7 @@ PipeWire in Qt projects.") (define-public kscreen (package (name "kscreen") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -773,12 +912,12 @@ PipeWire in Qt projects.") ".tar.xz")) (sha256 (base32 - "03qa2qrwdjgb6va7akhwpdvzky608sq2lnwj3b1f310mn3hmbmrq")))) + "0p5x7413xs7i0lahvpqn3w69n6vyhcccxisn8hff0nmcd9llm1bz")))) (build-system cmake-build-system) (arguments ;; TODO: All tests fail (list #:tests? #f)) - (native-inputs (list extra-cmake-modules qttools-5 pkg-config)) + (native-inputs (list extra-cmake-modules qttools pkg-config)) (inputs (list kconfig kdbusaddons kdeclarative @@ -792,12 +931,13 @@ PipeWire in Qt projects.") layer-shell-qt libkscreen libxi + libxkbcommon + ksvg plasma-wayland-protocols - qtsensors-5 - qtbase-5 - qtx11extras - xcb-util)) - (propagated-inputs (list plasma-framework)) + qtsensors + qtbase + xcb-util + libplasma)) (home-page "https://invent.kde.org/plasma/kscreen") (synopsis "Screen management software") (description "This package provides the screen management software for @@ -807,19 +947,20 @@ KDE Plasma Workspaces.") (define-public ksshaskpass (package (name "ksshaskpass") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/ksshaskpass-" version ".tar.xz")) (sha256 (base32 - "0vmydvj4c9c93y9wyyjs2hr9m0hygssk1asl4idbj7mcy6n7acg1")))) + "13kfvai8gcv8gbkw2ydixlbik1a113h4ais9wlna3jlnb1y0rya9")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs - (list kcoreaddons ki18n kwallet kwidgetsaddons qtbase-5)) + (list kcoreaddons ki18n kwallet kwidgetsaddons)) (home-page "https://invent.kde.org/plasma/ksshaskpass") (synopsis "Front-end for ssh-add using kwallet") (description "Ksshaskpass is a front-end for @code{ssh-add} which stores the @@ -831,7 +972,7 @@ call it if it is not associated to a terminal.") (define-public ksystemstats (package (name "ksystemstats") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -839,10 +980,11 @@ call it if it is not associated to a terminal.") version ".tar.xz")) (sha256 (base32 - "1fx5b566xx32q7gxi8qnnx6vny7ip5r65zi2znnx3azmwsc8jgvw")))) + "0fv96n03j6q2ainhw922abwwq1qrc8djqwk2cg6cjlnlkvvx9m1i")))) (build-system qt-build-system) (arguments - (list #:phases #~(modify-phases %standard-phases + (list #:qtbase qtbase + #:phases #~(modify-phases %standard-phases (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? @@ -913,22 +1055,22 @@ an elegant and intuitive experience for your tasks and plasmoids.") (define-public layer-shell-qt (package (name "layer-shell-qt") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/layer-shell-qt-" version ".tar.xz")) (sha256 (base32 - "08glqqh7jmqrli4n7j04lz3w3c6192w8p7ki51ksmwivnxylxi17")))) + "02gmfvvzjdhgsqwqr9ga43bjkbz0hnv1sz08zq19m5l3qy66ds0p")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules pkg-config)) (inputs (list libxkbcommon - qtbase-5 - qtdeclarative-5 - qtwayland-5 + qtdeclarative + qtwayland wayland wayland-protocols)) (home-page "https://invent.kde.org/plasma/layer-shell-qt") @@ -939,17 +1081,18 @@ an elegant and intuitive experience for your tasks and plasmoids.") (define-public kscreenlocker (package (name "kscreenlocker") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/kscreenlocker-" version ".tar.xz")) (sha256 (base32 - "11y3ksd29p8hdn8chaf8vscnc7fbh8xkjdsbakrb056p1r8kn0f2")))) + "1nk23jbi4n22hhffriqxx2845b4kfn676y910dv85c2b1mkipcxs")))) (build-system qt-build-system) (arguments (list #:tests? #f ;TODO: make tests pass + #:qtbase qtbase #:phases #~(modify-phases %standard-phases (add-before 'check 'check-setup (lambda* (#:key inputs outputs #:allow-other-keys) @@ -964,31 +1107,30 @@ an elegant and intuitive experience for your tasks and plasmoids.") (setenv "CTEST_OUTPUT_ON_FAILURE" "1") (invoke "dbus-launch" "ctest")))))))) (native-inputs (list extra-cmake-modules pkg-config + ;; for WaylandScanner + wayland ;; For tests. dbus xorg-server-for-tests)) (inputs (list kcmutils kconfig kcrash - kdeclarative kglobalaccel ki18n kio kidletime knotifications - ktextwidgets kwayland kwindowsystem kxmlgui + ksvg layer-shell-qt libkscreen - libseccomp ;for sandboxing the look'n'feel package - libxcursor ;missing in CMakeList.txt + libplasma libxi ;XInput, required for grabbing XInput2 devices linux-pam + libxkbcommon elogind ;optional loginctl support - qtbase-5 - qtdeclarative-5 - qtx11extras + qtdeclarative solid wayland xcb-util-keysyms)) @@ -998,45 +1140,58 @@ an elegant and intuitive experience for your tasks and plasmoids.") "@code{kscreenlocker} is a library for creating secure lock screens.") (license license:gpl2+))) -(define-public ksysguard +(define-public libkscreen (package - (name "ksysguard") - (version "5.22.0") + (name "libkscreen") + (version "6.1.2") (source (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/ksysguard/" version - "/ksysguard-" version ".tar.xz")) - (sha256 - (base32 "0bb2aj46v7ig0wn3ir68igryl2gblz2n75cddn8fwamvbx76570g")))) + (method url-fetch) + (uri (string-append "mirror://kde/stable/plasma/" version "/" + name "-" version ".tar.xz")) + (sha256 + (base32 "1f4pb09b9n6fbwlcs5fva3wpfamg9maz2k4rf0dyr2ihyjwh3p1n")))) (build-system qt-build-system) - ;; TODO: No tests found + (arguments + (list + #:qtbase qtbase + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'check-env-setup + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "HOME" (getcwd)) + (with-output-to-file "autotests/BLACKLIST" + (lambda _ + (for-each + (lambda (name) + (display (string-append "[" name "]\n*\n"))) + (list + "verifyOutputs" + ;; also fail on upstream + "testEdidParser" + "testEnv")))))))))) (native-inputs - (list extra-cmake-modules kdoctools)) + (list extra-cmake-modules + pkg-config + qttools + ;; For testing. + dbus)) (inputs - (list kconfig - kcoreaddons - kdbusaddons - ki18n - kiconthemes - kinit - kio - kitemviews - knewstuff - knotifications - kwindowsystem - libksysguard - `(,lm-sensors "lib") - qtbase-5)) - (home-page "https://www.kde.org/applications/system/ksysguard/") - (synopsis "Plasma process and performance monitor") - (description "KSysGuard is a program to monitor various elements of your -system, or any other remote system with the KSysGuard daemon (ksysgardd) -installed.") + (list kwayland libxrandr plasma-wayland-protocols qtwayland + wayland + libxkbcommon)) + (home-page "https://community.kde.org/Solid/Projects/ScreenManagement") + (synopsis "KDE's screen management software") + (description "KScreen is the new screen management software for KDE Plasma +Workspaces which tries to be as magic and automatic as possible for users with +basic needs and easy to configure for those who want special setups.") (license license:gpl2+))) -(define-public libkscreen +;; use by lxqt-config +(define-public libkscreen-5 (package + (inherit libkscreen) (name "libkscreen") (version "5.27.7") (source @@ -1048,20 +1203,20 @@ installed.") (base32 "1ary7qavz8vkzbvjx2mxv09h61hxa7i4f7rfgbykldbc83ripdc6")))) (build-system qt-build-system) (arguments - '(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (setenv "HOME" (getcwd)) - (setenv "QT_QPA_PLATFORM" "offscreen") - (setenv "WAYLAND_DISPLAY" "libkscreen-test-wayland-backend-0") - (invoke "ctest" "-E" - (string-append "(kscreen-testedid" - "|kscreen-testqscreenbackend" - "|kscreen-testkwaylandbackend" - "|kscreen-testkwaylandconfig" - "|kscreen-testkwaylanddpms)")))))))) + (list #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "HOME" (getcwd)) + (setenv "QT_QPA_PLATFORM" "offscreen") + (setenv "WAYLAND_DISPLAY" "libkscreen-test-wayland-backend-0") + (invoke "ctest" "-E" + (string-append "(kscreen-testedid" + "|kscreen-testqscreenbackend" + "|kscreen-testkwaylandbackend" + "|kscreen-testkwaylandconfig" + "|kscreen-testkwaylanddpms)")))))))) (native-inputs (list extra-cmake-modules pkg-config @@ -1069,29 +1224,22 @@ installed.") ;; For testing. dbus)) (inputs - (list kconfig kwayland libxrandr plasma-wayland-protocols - qtbase-5 qtwayland-5 wayland qtx11extras)) - (home-page "https://community.kde.org/Solid/Projects/ScreenManagement") - (synopsis "KDE's screen management software") - (description "KScreen is the new screen management software for KDE Plasma -Workspaces which tries to be as magic and automatic as possible for users with -basic needs and easy to configure for those who want special setups.") - (license license:gpl2+))) + (list kconfig-5 kwayland-5 libxrandr plasma-wayland-protocols + qtbase-5 qtwayland-5 wayland qtx11extras)))) (define-public libksysguard (package (name "libksysguard") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/libksysguard-" version ".tar.xz")) - (patches (search-patches "libksysguard-qdiriterator-follow-symlinks.patch")) (sha256 - (base32 "066bjar4105bfyry6ni7nnikz66bqzy5nvssz6vm4np3aa996ak8")))) + (base32 "1l1fy5i9yxh7fnxfyfsk0hnyd1vfzac336kcfwklkqa7l796hpc0")))) (native-inputs - (list bash-minimal extra-cmake-modules pkg-config qttools-5)) + (list bash-minimal extra-cmake-modules pkg-config qttools)) (inputs (list kauth kcompletion @@ -1111,22 +1259,21 @@ basic needs and easy to configure for those who want special setups.") libcap libpcap `(,lm-sensors "lib") - plasma-framework - qtbase-5 - qtdeclarative-5 - qtscript - qtwebchannel-5 - qtwebengine-5 - qtx11extras + libplasma + qtdeclarative + qtwebchannel + qtwebengine zlib)) (build-system qt-build-system) (arguments - (list #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'fix-test - (lambda* _ - (substitute* "autotests/processtest.cpp" - (("/bin/sh") - (which "bash")))))))) + (list + #:qtbase qtbase + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'fix-test + (lambda* _ + (substitute* "autotests/processtest.cpp" + (("/bin/sh") + (which "bash")))))))) (home-page "https://userbase.kde.org/KSysGuard") (synopsis "Network enabled task and system monitoring") (description "KSysGuard can obtain information on system load and @@ -1137,7 +1284,7 @@ with a ksysguardd daemon, which may also run on a remote system.") (define-public kwallet-pam (package (name "kwallet-pam") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -1145,10 +1292,12 @@ with a ksysguardd daemon, which may also run on a remote system.") ".tar.xz")) (sha256 (base32 - "1ac0hqpzqivg40jq7pfr2s1zydl600a3nyzfv97wc20i9myzafrb")))) + "1d7b192rislaljz7j8wpjzw529a9hy94pzr063nnlz982251nm77")))) (build-system qt-build-system) (arguments - (list #:tests? #f)) ;no tests + (list + #:qtbase qtbase + #:tests? #f)) ;no tests (native-inputs (list extra-cmake-modules pkg-config)) (inputs (list linux-pam kwallet libgcrypt socat)) (synopsis "PAM Integration with KWallet") @@ -1160,7 +1309,7 @@ you login.") (define-public kwayland-integration (package (name "kwayland-integration") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -1168,7 +1317,7 @@ you login.") version ".tar.xz")) (sha256 (base32 - "1fvf64vx5m3h5v8h697ixkcifhva6a14wlz75kv6759ji9l9fy8y")))) + "16wlnsavxbm54am6am29667scilvdksgbaskwqdkaazqqjxn298a")))) (build-system qt-build-system) (arguments (list #:phases #~(modify-phases %standard-phases @@ -1188,12 +1337,13 @@ you login.") "/lib/qt5/plugins:" (getenv "QT_PLUGIN_PATH")))))))) (native-inputs (list extra-cmake-modules wayland-protocols pkg-config)) - (inputs (list kguiaddons - kidletime - kwindowsystem - kwayland + (inputs (list kguiaddons-5 + kidletime-5 + kwindowsystem-5 + kwayland-5 libxkbcommon wayland + plasma-wayland-protocols qtbase-5 qtwayland-5)) (synopsis "KWayland runtime integration plugins") @@ -1205,18 +1355,24 @@ KDE Frameworks components.") (define-public kwin (package (name "kwin") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/plasma/" version "/" + (uri (string-append "mirror://kde/stable/plasma/" + version "/" name "-" version ".tar.xz")) (patches (search-patches "kwin-unwrap-executable-name-for-dot-desktop-search.patch")) (sha256 (base32 - "0bssp76lzqqlan5pfg6wjf4z9c6pl6p66ri8p82vqqw406x5bzyb")))) + "03y0als06vryf1cwiladnn9a3vnsp32gp9bcvp42mm017g485ic2")))) (build-system qt-build-system) (arguments (list + #:qtbase qtbase + #:configure-flags + #~(list (string-append "-DQtWaylandScanner_EXECUTABLE=" + #$(this-package-native-input "qtwayland") + "/lib/qt6/libexec/qtwaylandscanner")) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch @@ -1234,8 +1390,8 @@ KDE Frameworks components.") (string-append "setProgram(QByteArrayLiteral(\"" (which "glxgears") "\")"))) (substitute* - '("src/wayland/tests/renderingservertest.cpp" - "src/wayland/tests/waylandservertest.cpp") + '("tests/renderingservertest.cpp" + "tests/waylandservertest.cpp") (("QByteArrayLiteral\\(\"Xwayland\"\\)") (string-append "QByteArrayLiteral(\"" (which "Xwayland") "\")"))) @@ -1252,14 +1408,6 @@ KDE Frameworks components.") (substitute* '("cmake/modules/Findhwdata.cmake") (("/usr/share") (string-append #$(this-package-input "hwdata") "/share"))))) - (add-after 'install 'add-symlinks - (lambda* (#:key outputs #:allow-other-keys) - (let ((kst5 (string-append #$output - "/share/kservicetypes5/"))) - (symlink (string-append kst5 "kwineffect.desktop") - (string-append kst5 "kwin-effect.desktop")) - (symlink (string-append kst5 "kwinscript.desktop") - (string-append kst5 "kwin-script.desktop"))))) (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? @@ -1270,7 +1418,7 @@ KDE Frameworks components.") (getenv "XDG_DATA_DIRS"))) (setenv "QT_PLUGIN_PATH" (string-append #$output - "/lib/qt5/plugins:" + "/lib/qt6/plugins:" (getenv "QT_PLUGIN_PATH"))) (setenv "DISPLAY" ":1") (system "Xvfb :1 &") @@ -1279,31 +1427,40 @@ KDE Frameworks components.") "ctest" "-E" (string-join - (list "kwin-testXkb" - "kwin-testPointerInput" - "kwin-testXdgShellWindow" - "kwin-testXdgShellWindow-waylandonly" - "kwin-testSceneOpenGLES" - "kwin-testSceneOpenGLES-waylandonly" - "kwin-testNightColor" - "kwin-testNightColor-waylandonly" - "kwin-testScriptedEffects" - "kwayland-testWaylandSurface") + (list + "kwin-testDrm" ;; require Drm + "kwin-testInputMethod" + "kwin-testPlasmaWindow" ;; require plasma-workspace qml module. + "kwin-testButtonRebind" + "kwin-testDecorationInput" + "kwin-testPointerInput" + "kwin-testXdgShellWindow" + "kwin-testXdgShellWindow-waylandonly" + "kwin-testSceneOpenGLES" + "kwin-testSceneOpenGLES-waylandonly" + "kwin-testNightColor" + "kwin-testNightColor-waylandonly" + "kwin-testScriptedEffects" + "kwayland-testServerSideDecoration" + "kwayland-testWaylandSurface") "|")))))))) (native-inputs (list extra-cmake-modules dbus kdoctools mesa-utils pkg-config - qttools-5 - wayland-protocols - xorg-server-for-tests)) + qttools + wayland-protocols-next + xorg-server-for-tests + python-minimal + ;; for QtWaylandScanner + qtwayland)) (inputs (list breeze eudev fontconfig freetype `(,hwdata "pnp") - kactivities + plasma-activities kcmutils kcompletion kconfig @@ -1314,6 +1471,7 @@ KDE Frameworks components.") kdeclarative kdecoration kglobalaccel + kglobalacceld ki18n kiconthemes kidletime @@ -1328,6 +1486,9 @@ KDE Frameworks components.") kwayland kwindowsystem kxmlgui + ksvg + kauth + kguiaddons libqaccessibilityclient lcms libcap @@ -1336,13 +1497,13 @@ KDE Frameworks components.") libinput libxkbcommon pipewire - plasma-framework + libplasma plasma-wayland-protocols - qtbase-5 - qtdeclarative-5 - qtmultimedia-5 - qtwayland-5 - qtx11extras + qt5compat + qtdeclarative + qtmultimedia + qtwayland + qtsensors wayland xcb-util ;fails at build time without this xcb-util-cursor @@ -1351,6 +1512,7 @@ KDE Frameworks components.") xcmsdb xinput ;XXX: Says disabled in configure phase xorg-server-xwayland + libdisplay-info zlib)) ;; Runtime-only dependency needed for mapping monitor hardware vendor IDs to full names ;; * QtQuick.Controls-QMLModule, QML module 'QtQuick.Controls' is a runtime dependency. @@ -1367,7 +1529,7 @@ conjunction with the KDE Plasma Desktop.") (define-public kwrited (package (name "kwrited") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -1375,10 +1537,11 @@ conjunction with the KDE Plasma Desktop.") version ".tar.xz")) (sha256 (base32 - "1a4g05ynblbz0j0lqclxf6628x6wcd3b52l0smic3rdvbis43v0n")))) + "1h8njjh277jk66r4bm913m953irgdy3126gsamnjzjkrd13qlr45")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) (inputs (list kcoreaddons ki18n kpty knotifications)) + (arguments (list #:qtbase qtbase)) (home-page "https://invent.kde.org/plasma/kwrited") (synopsis "System notification daemon") (description @@ -1418,7 +1581,7 @@ and minimalistic.") (define-public milou (package (name "milou") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -1426,7 +1589,7 @@ and minimalistic.") version ".tar.xz")) (sha256 (base32 - "0lq8m72nwink8x46m8qd5zdkadym1kc70ipnkb04b16mr7zhnsc1")))) + "15vr74s66aj617vh0szf6r3s5iffbg8mwchf1kkvhbw5fnw912lm")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) (inputs (list kcoreaddons @@ -1434,20 +1597,47 @@ and minimalistic.") kdeclarative kitemmodels kservice - plasma-framework + libplasma kwindowsystem krunner - qtdeclarative-5)) + ksvg + qtdeclarative)) + (arguments (list #:qtbase qtbase)) (synopsis "Dedicated search application built on top of Baloo") (description "This package provides a dedicated search application built on top of Baloo.") (home-page "https://invent.kde.org/plasma/milou") (license (list license:gpl2+)))) +(define-public qqc2-breeze-style + (package + (name "qqc2-breeze-style") + (version "6.1.2") + (source (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/plasma/" + version "/" name "-" + version ".tar.xz")) + (sha256 + (base32 + "1n8yqiyvn5cyvxl7mp33x2jbkxzzqfzd1wvgdzybqx1hw3m3lh1j")))) + (build-system qt-build-system) + (arguments + (list #:qtbase qtbase)) + (native-inputs + (list extra-cmake-modules)) + (inputs (list qtdeclarative + kiconthemes kguiaddons kconfig kirigami kcoreaddons + kcolorscheme kquickcharts)) + (home-page "https://invent.kde.org/plasma/qqc2-breeze-style") + (synopsis "Breeze inspired Qt Quick Controls Style") + (description "This package provides Breeze inspired Qt Quick Controls Style.") + (license (list license:lgpl2.0+ license:gpl2+)))) + (define-public oxygen-sounds (package (name "oxygen-sounds") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -1455,7 +1645,7 @@ on top of Baloo.") version ".tar.xz")) (sha256 (base32 - "132jaabfpj8k6xk6f1732a0qgjz1mzyyk74b1mm7q7pyhpypr2gq")))) + "02yz7mlnbylhv2d66hl1dvp6ylnp9lj5f07ivdjcwpq556agxljf")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules)) (home-page "https://community.kde.org/Frameworks") @@ -1463,10 +1653,30 @@ on top of Baloo.") (description "This package provides Oxygen sounds for the KDE desktop.") (license license:lgpl3+))) +(define-public ocean-sound-theme + (package + (name "ocean-sound-theme") + (version "6.1.2") + (source (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/plasma/" + version "/ocean-sound-theme" "-" + version ".tar.xz")) + (sha256 + (base32 + "0ysgx7bg5njgfv3rxdz5bzqh0iki1qb0pwqk4dmnwc3hx3c89ynb")))) + (build-system cmake-build-system) + (native-inputs (list extra-cmake-modules)) + (inputs (list qtbase)) + (home-page "https://invent.kde.org/plasma/ocean-sound-theme") + (synopsis "Ocean Sound Theme for Plasma") + (description "This package provides Ocean Sound Theme for Plasma.") + (license license:lgpl3+))) + (define-public plasma (package (name "plasma") - (version "5.27.7") + (version "6.1.2") (source #f) (build-system trivial-build-system) (arguments @@ -1474,36 +1684,39 @@ on top of Baloo.") (mkdir #$output)))) ;; TODO: cleanup, check what is no need (propagated-inputs (list kdeclarative ;; require by sddm breeze theme + plasma5support ;; require by sddm breeze theme + qt5compat ;; require by sddm breeze theme + kiconthemes ;; require by sddm breeze theme + ksvg ;; require by sddm breeze theme qqc2-desktop-style ; qtquickcontrols2 theme + ocean-sound-theme + qtdeclarative + qtsvg ;; for svg support + qtbase ;; why? baloo breeze-icons ; default mouse icon breeze breeze-gtk + layer-shell-qt drkonqi kactivitymanagerd ; require this run dbus kde-cli-tools kdecoration kdeplasma-addons - kgamma - khotkeys ktexteditor - kscreen libkscreen - + krdp ksystemstats + kwallet kwallet-pam kwin - kinit - + plasma-workspace-wallpapers libksysguard milou - ;; oxygen oxygen-sounds - + qqc2-breeze-style kde-gtk-config - kdesu - krunner kinfocenter kscreenlocker ksshaskpass @@ -1529,16 +1742,14 @@ on top of Baloo.") (resolve-interface '(gnu packages kde-systemtools)) 'spectacle) - - kwayland-integration plasma-firewall plasma-integration plasma-nm plasma-pa plasma-systemmonitor ;; plasma-thunderbolt ;; waiting for bolt - kglobalaccel + kglobalacceld plasma-vault plasma-workspace powerdevil)) @@ -1548,76 +1759,102 @@ on top of Baloo.") "KDE Plasma is an advanced graphical desktop system.") (license license:gpl2+))) -(define-public plasma-bigscreen +(define-public plasma5support (package - (name "plasma-bigscreen") - (version "5.27.7") + (name "plasma5support") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "0b2w0d5w1s2jm7al1nqdc1qh9fmrj8fw93wjbb2bsa9fabz2i81b")))) - (build-system cmake-build-system) - (arguments - (list #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'fix-startplasma - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "bin/plasma-bigscreen-wayland.in" - (("^startplasma-wayland") - (search-input-file inputs - "/bin/startplasma-wayland"))) - (substitute* "bin/plasma-bigscreen-x11" - (("startplasma-x11") - (search-input-file inputs - "/bin/startplasma-x11")))))))) + "17cwd0iyrzggb56xc37mvw7n7r0ddiasmxgfhzgh67sdxwpp7kzj")))) + (build-system qt-build-system) + (arguments (list #:qtbase qtbase + + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? parallel-tests? #:allow-other-keys) + (invoke "ctest" + "-E" + ;; also fail in upstream. + "(pluginloadertest)" + "-j" + (if parallel-tests? + (number->string (parallel-job-count)) + "1"))))))) (native-inputs (list extra-cmake-modules)) - (inputs (list kactivities - kactivities-stats - plasma-framework - ki18n - kirigami - kdeclarative - kcmutils - knotifications - kio - kwayland - kwindowsystem - plasma-workspace - qtbase-5 - qtmultimedia-5)) - (home-page "https://invent.kde.org/plasma/plasma-bigscreen") - (synopsis "Plasma shell for TVs") - (description - "This package provides a big launcher designed for large screens. It -is controllable via voice or TV remote.") - (license license:gpl2+))) + (propagated-inputs (list kcoreaddons)) + (inputs (list + kconfig + ki18n + qtdeclarative + kguiaddons + knotifications + solid + libksysguard)) + (home-page "https://invent.kde.org/plasma/plasma5support") + (synopsis "Support components for porting from KF5/Qt5 to KF6/Qt6") + (description "This package provids support components for porting from +KF5/Qt5 to KF6/Qt6") + (license (list license:lgpl2.0+)))) + +(define-public mpvqt + (package + (name "mpvqt") + (version "1.0.0") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://kde/stable/mpvqt/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1fafyn3a8hgg1g3nfka6hyynlmqdygaxz0fhp4ckxwz54nlx4cci")))) + (build-system qt-build-system) + (native-inputs + (list extra-cmake-modules pkg-config)) + (inputs + (list qtdeclarative)) + (propagated-inputs + (list mpv)) + (arguments + (list #:qtbase qtbase)) + (home-page "https://invent.kde.org/libraries/mpvqt") + (synopsis "A libmpv wrapper for QtQuick2 and QML") + (description "This package provides a libmpv wrapper for QtQuick2 and QML.") + (license license:lgpl2.1+))) (define-public plasmatube (package (name "plasmatube") - (version "23.01.0") + (version "24.05.2") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/plasma-mobile/" - version "/" name "-" version ".tar.xz")) + (uri (string-append "mirror://kde/stable/release-service/" version + "/src/plasmatube-" version ".tar.xz")) (sha256 (base32 - "06hwa1m6gaacjmcyssa63vw43cgx096x9aj87rv1z9k9qsv2qgfj")))) - (build-system cmake-build-system) - (native-inputs (list extra-cmake-modules pkg-config)) + "0dkn1ysgvhwrfdffpwbgzblc0jbb94h5r4cp23gnnk38iy4fsrim")))) + (build-system qt-build-system) + (native-inputs (list extra-cmake-modules pkg-config python-minimal)) (inputs (list kconfig + kcoreaddons + kdbusaddons kirigami + kirigami-addons ki18n - qtbase-5 - qtdeclarative-5 - qtmultimedia-5 - qtquickcontrols2-5 - qtsvg-5 - mpv - youtube-dl)) + kwindowsystem + qtdeclarative + qtmultimedia + qtsvg + qtkeychain-qt6 + mpvqt + yt-dlp)) + (arguments (list #:qtbase qtbase)) (home-page "https://apps.kde.org/plasmatube/") (synopsis "Kirigami YouTube video player") (description "This package provides YouTube video player based @@ -1656,14 +1893,14 @@ active window on Plasma Desktop.") (define-public plasma-browser-integration (package (name "plasma-browser-integration") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "0c30pdlhl452bjpdc7mwxl01hqabahyc0j1cc54liy0hla9vir9y")))) + "07wsbq3p55k9jha341zpxgk6v4iaj3j4agp45h32m2881fjrwb80")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules pkg-config)) ;; TODO: Figure out how to integrate this package into web browsers @@ -1678,45 +1915,49 @@ active window on Plasma Desktop.") knotifications kitemmodels krunner - kactivities + plasma-activities purpose kfilemetadata kjobwidgets - qtdeclarative-5)) + kstatusnotifieritem + qtdeclarative)) (propagated-inputs (list plasma-workspace)) + (arguments (list #:qtbase qtbase)) (home-page "https://invent.kde.org/plasma/plasma-browser-integration") (synopsis "Integrate browsers into the Plasma Desktop") (description "This package aims to provide better integration of web browsers with -the KDE Plasma 5 desktop.") +the KDE Plasma 6 desktop.") (license license:gpl3+))) (define-public plasma-desktop (package (name "plasma-desktop") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "1njkjf3fhxfmwyviypxqzrn23klxiih82bazvd8y61cshqwai6i2")))) + "1n72hynnvgyy0ja0f20p322c2y5yvb5ra1i4jrlxwji795y09r19")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules dbus kdoctools intltool pkg-config - qtsvg-5 - qttools-5 + qtsvg + qttools + libxml2 ;; require QtWaylandScanner - qtwayland-5)) - (inputs (list packagekit-qt5 + qtwayland)) + (inputs (list packagekit-qt6 signon-plugin-oauth2 - signond + signond-qt6 + icu4c attica - appstream-qt + appstream-qt6 baloo breeze breeze-icons @@ -1725,8 +1966,8 @@ the KDE Plasma 5 desktop.") glib ibus kaccounts-integration - kactivities - kactivities-stats + plasma-activities + plasma-activities-stats kauth karchive kcmutils @@ -1737,14 +1978,12 @@ the KDE Plasma 5 desktop.") kdeclarative kded kdesu - kdelibs4support kglobalaccel kguiaddons kholidays ki18n kiconthemes kidletime - kinit kio kitemmodels knewstuff @@ -1761,8 +2000,10 @@ the KDE Plasma 5 desktop.") kwallet kwayland kwin + ksvg + plasma5support layer-shell-qt - libaccounts-qt + libaccounts-qt6 libcanberra libkscreen libksysguard @@ -1778,17 +2019,14 @@ the KDE Plasma 5 desktop.") networkmanager-qt phonon pipewire - plasma-framework + libplasma plasma-wayland-protocols pulseaudio prison qqc2-desktop-style - qtbase-5 - qtdeclarative-5 - qtquickcontrols-5 - qtquickcontrols2-5 - qtwayland-5 - qtx11extras + qt5compat + qtdeclarative + qtwayland wayland wayland-protocols xcb-util @@ -1805,10 +2043,18 @@ the KDE Plasma 5 desktop.") libxkbfile libxcursor libxkbcommon)) - (propagated-inputs (list iso-codes kirigami plasma-workspace)) + (propagated-inputs (list iso-codes kirigami kcmutils plasma-workspace)) (arguments - (list #:phases + (list #:qtbase qtbase + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'patch-wallpaper + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "sddm-theme/theme.conf.cmake" + (("background=..KDE_INSTALL_FULL_WALLPAPERDIR.") + (string-append "background=" + #$(this-package-input "breeze") + "/share/wallpapers"))))) (add-after 'unpack 'fix-paths (lambda* (#:key inputs #:allow-other-keys) (substitute* "kcms/keyboard/iso_codes.h" @@ -1823,7 +2069,7 @@ the KDE Plasma 5 desktop.") (setenv "XDG_RUNTIME_DIR" (getcwd)) (setenv "XDG_CACHE_HOME" (getcwd)) (setenv "QT_QPA_PLATFORM" "offscreen") - (invoke "ctest" "-E" "foldermodeltest"))))))) + (invoke "ctest" "-E" "(kcm-keyboard-keyboard_memory_persister_test|foldermodeltest)"))))))) (home-page "https://kde.org/plasma-desktop/") (synopsis "Plasma for the Desktop") (description @@ -1838,7 +2084,7 @@ activities effectively, without being distracting.") (define-public plasma-disks (package (name "plasma-disks") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -1846,13 +2092,27 @@ activities effectively, without being distracting.") version ".tar.xz")) (sha256 (base32 - "0jwjv20ra1mhwl2cm7x2jz8pasmkc58fd57qxhzzf84l4sgbda9v")))) + "1rk8356fpy2vgfi79kz2xlkz032jb3cd9y6rsp9f875bik5j25hz")))) (build-system qt-build-system) + (arguments (list + #:qtbase qtbase + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'set-smartctl-path + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/helper.cpp" + (("\"smartctl\"") + (string-append + "\"" + (search-input-file + inputs "/sbin/smartctl") + "\"")))))))) (native-inputs (list extra-cmake-modules)) (inputs (list kcoreaddons kdbusaddons knotifications ki18n + kcmutils solid kservice kio @@ -1867,7 +2127,7 @@ activities effectively, without being distracting.") (define-public plasma-firewall (package (name "plasma-firewall") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -1875,16 +2135,18 @@ activities effectively, without being distracting.") version ".tar.xz")) (sha256 (base32 - "1n5ljkydhcx6qapwrshslq835zaf02gssp2zvzi3vwfy4asc7ind")))) + "0k2rf8w5iwsxnq0amrss8p0ncl3q4sxl06531p3d2ga6glh0kspn")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules)) (inputs (list iproute + kauth kcoreaddons kcmutils ki18n kdeclarative python - qtdeclarative-5)) + qtdeclarative)) (synopsis "Control Panel for system firewall") (description "This package provides interface to system firewall.") (home-page "https://invent.kde.org/plasma/plasma-firewall") @@ -1893,7 +2155,7 @@ activities effectively, without being distracting.") (define-public plasma-integration (package (name "plasma-integration") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -1901,10 +2163,12 @@ activities effectively, without being distracting.") version ".tar.xz")) (sha256 (base32 - "1ahzckvc69wk2rx73sl40h0in1y7ny0vm0i7lbrrcggv1v36dwp3")))) + "0108pzfjwd84ysysq705k8ccy4hi9mmx412ll3d751dc50lj6np1")))) (build-system qt-build-system) (arguments - (list #:tests? #f ;TODO: Failing tests + (list #:qtbase qtbase + #:configure-flags #~(list "-DBUILD_QT5=OFF") + #:tests? #f ;TODO: Failing tests #:phases #~(modify-phases %standard-phases (replace 'check (lambda* (#:key tests? #:allow-other-keys) @@ -1918,20 +2182,27 @@ activities effectively, without being distracting.") (native-inputs (list extra-cmake-modules pkg-config)) (inputs (list breeze kconfig - kio - ki18n - kwidgetsaddons kconfigwidgets + kguiaddons + ki18n kiconthemes + kio knotifications + kstatusnotifieritem + kwayland + kwidgetsaddons + kxmlgui libxcb libxcursor + libxkbcommon plasma-wayland-protocols - qtdeclarative-5 - qtquickcontrols2-5 - qtwayland-5 - qtx11extras - wayland)) + qtdeclarative + qtwayland + wayland + xdg-desktop-portal-kde + font-google-noto-sans-cjk + font-google-noto-emoji + font-hack)) (home-page "https://invent.kde.org/plasma/plasma-integration") (synopsis "Qt Platform Theme integration plugins for the Plasma workspaces") @@ -1943,19 +2214,22 @@ integration of Qt applications when running on a KDE Plasma workspace.") (define-public plasma-nano (package (name "plasma-nano") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/plasma-nano-" version ".tar.xz")) (sha256 (base32 - "14wc76bxnwd0z51gz4zb88p5h9n2711ifr1wpx9lrj9r7y1llank")))) + "1dyap53ad32s27sxx7rzszp3q0avfiqwfc05a2f5sbqqrwf4bpk3")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules pkg-config qttools)) - (inputs (list qtbase-5 - qtdeclarative-5 - plasma-framework + (inputs (list qtbase + qtdeclarative + qtsvg + libplasma + kservice + kitemmodels kwindowsystem kwayland ki18n)) @@ -1968,7 +2242,7 @@ integration of Qt applications when running on a KDE Plasma workspace.") (define-public plasma-nm (package (name "plasma-nm") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -1976,10 +2250,11 @@ integration of Qt applications when running on a KDE Plasma workspace.") ".tar.xz")) (sha256 (base32 - "1w9zclih2mh8gqwahsmbbm0nrg1b6gcr5w2w02szlw30iq8k92j8")))) + "02148q5707cck0qix2c3k7npp9kblnq5h79xvb99rq45sbwc51pr")))) (build-system qt-build-system) (arguments - (list #:phases #~(modify-phases %standard-phases + (list #:qtbase qtbase + #:phases #~(modify-phases %standard-phases (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? @@ -1997,18 +2272,20 @@ integration of Qt applications when running on a KDE Plasma workspace.") networkmanager-qt knotifications kirigami - plasma-framework + libplasma modemmanager-qt network-manager - qca + qca-qt6 kservice solid prison kwallet kwidgetsaddons kwindowsystem + ksvg + qcoro-qt6 openconnect - qtdeclarative-5)) + qtdeclarative)) (synopsis "Plasma applet for managing network connections") (description "This package provides Plasma applet for managing network connections.") @@ -2104,7 +2381,7 @@ customizable platform for mobile devices.") (define-public plasma-pa (package (name "plasma-pa") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -2112,20 +2389,29 @@ customizable platform for mobile devices.") version ".tar.xz")) (sha256 (base32 - "1vg28v5n648y94m6amcwmr0n7dw4a2kfx16kny7jb9bkmxrgnwsc")))) + "0rj4dffgzinxj5b1wgjz2mmc73c51bx845g9vvx17k7xdcry117x")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase + ;; test require selenium-webdriver-at-spi-run + #:tests? #f)) (native-inputs (list extra-cmake-modules kdoctools pkg-config)) (inputs (list glib kcoreaddons + kconfig kcmutils kdeclarative kglobalaccel + kstatusnotifieritem knotifications kwindowsystem kirigami + ksvg + kdbusaddons + pulseaudio-qt ki18n - qtdeclarative-5)) - (propagated-inputs (list libcanberra pulseaudio plasma-framework)) + qtdeclarative)) + (propagated-inputs (list libcanberra pulseaudio + libplasma)) (home-page "https://invent.kde.org/plasma/plasma-pa") (synopsis "Plasma applet for audio volume management using PulseAudio") (description @@ -2136,19 +2422,24 @@ PulseAudio.") (define-public plasma-pass (package (name "plasma-pass") - (version "1.2.1") + (version "1.2.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/" name "/" name "-" version ".tar.xz")) (sha256 (base32 - "0x1yj9wsz2hb5333g645wjasxd83gd2phpwg80h24vfpqdhz62qj")))) + "1klpqcc2wsf3myvzhy9l0sv2iws458iad2mwg3z0cy2d11an8wia")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) - (inputs (list ki18n kitemmodels kwindowsystem oath-toolkit - qgpgme qtdeclarative-5)) - (propagated-inputs (list plasma-framework)) + (inputs (list ki18n kitemmodels kwindowsystem kio + libplasma + oath-toolkit + plasma5support + qgpgme-qt6-1.23 + qtdeclarative)) + (arguments (list #:qtbase qtbase + #:configure-flags #~(list "-DQT_MAJOR_VERSION=6"))) (home-page "https://invent.kde.org/plasma/plasma-pass") (synopsis "Plasma applet for the Pass password manager") (description @@ -2259,27 +2550,59 @@ Desktop.") (define-public plasma-vault (package (name "plasma-vault") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "1p5m5rlamb50cbd1qlx81m003sv8vdijkpy5airmy1pf6xmvl6hq")))) + "1y8f2n6g018gy1dxxhgsq6d341asxhjxingd9vizf89y85h6vacn")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules pkg-config)) (inputs (list kio ki18n kconfigwidgets kconfig - kactivities + plasma-activities kdbusaddons kiconthemes - networkmanager-qt + kitemmodels libksysguard - plasma-framework - qtdeclarative-5)) + networkmanager-qt + libplasma + qtdeclarative + + cryfs + fuse-2 + gocryptfs + encfs)) + (arguments + (list + #:qtbase qtbase + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch + (lambda* (#:key inputs #:allow-other-keys) + (let ((fusermount (search-input-file inputs "/bin/fusermount")) + (gocryptfs (search-input-file inputs "/bin/gocryptfs")) + (cryfs (search-input-file inputs "/bin/cryfs")) + (encfs (search-input-file inputs "/bin/encfs")) + (encfsctl (search-input-file inputs "/bin/encfsctl"))) + (substitute* "kded/engine/fusebackend_p.cpp" + (("\"fusermount\"") + (string-append "\"" fusermount "\""))) + (substitute* "kded/engine/backends/gocryptfs/gocryptfsbackend.cpp" + (("\"gocryptfs\"") + (string-append "\"" gocryptfs "\""))) + (substitute* "kded/engine/backends/cryfs/cryfsbackend.cpp" + (("\"cryfs\"") + (string-append "\"" cryfs "\""))) + (substitute* "kded/engine/backends/encfs/encfsbackend.cpp" + (("\"encfs\"") + (string-append "\"" encfs "\"")) + (("\"encfsctl\"") + (string-append "\"" encfsctl "\""))))))))) (home-page "https://invent.kde.org/plasma/plasma-vault") (synopsis "Plasma applet and services for creating encrypted vaults") (description "Provides Plasma applet and services for creating encrypted @@ -2289,32 +2612,35 @@ vaults.") (define-public plasma-systemmonitor (package (name "plasma-systemmonitor") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "1qr8krc7d1hzxv0gx0ii0rxk9bm62rgh157mr8x785qqbd11nq8l")))) + "1v329hfr0jjqbkbidkbb52i235c4g4ix2x3mngyfvjf3ykvxd1xs")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) (inputs (list ki18n kconfig + kcrash kdeclarative kservice kiconthemes kglobalaccel kio kdbusaddons + kpackage kirigami + kirigami-addons knewstuff ksystemstats kitemmodels libksysguard qqc2-desktop-style - qtdeclarative-5 - qtquickcontrols2-5)) + qtdeclarative)) + (arguments (list #:qtbase qtbase)) (synopsis "System sensors, process information and other system resources monitor") (description "This package provides an interface for monitoring system @@ -2325,7 +2651,7 @@ sensors, process information and other system resources.") (define-public plasma-welcome (package (name "plasma-welcome") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -2334,7 +2660,7 @@ sensors, process information and other system resources.") version ".tar.xz")) (sha256 (base32 - "0nz1hxz5nvgl3sbm6k3a76s0l3fy3j38i4plly2zhp5xqdk0ks1x")))) + "19d0p1nsg9jjpv9d8948hnpb75gnrjj4xv6r0i4dzbg4mz25vb32")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules pkg-config)) @@ -2344,21 +2670,24 @@ sensors, process information and other system resources.") kdeclarative ki18n kio + kconfigwidgets + kcmutils + ksvg kirigami + kirigami-addons knotifications kservice knewstuff kaccounts-integration - signond + signond-qt6 kuserfeedback - libaccounts-qt + libaccounts-qt6 kwindowsystem networkmanager-qt - plasma-framework - qtdeclarative-5 - qtgraphicaleffects - qtsvg-5 - qtquickcontrols2-5)) + libplasma + qtdeclarative + qtsvg)) + (arguments (list #:qtbase qtbase)) (synopsis "Plasma welcome screen") (description "This package provides a wizard for Plasma to configure settings.") @@ -2368,20 +2697,21 @@ sensors, process information and other system resources.") (define-public plasma-workspace (package (name "plasma-workspace") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "0pyf5vc466mfgicxpp76igdz58lpa0n7x2cl2hhaq4zmrlfr8hh6")))) + "16k55b08q42nc89slp49ivqssx6rs21zlzshwmjqx1na5nwikw27")))) (build-system qt-build-system) - (native-inputs (list extra-cmake-modules kdoctools pkg-config qtsvg-5 - qttools-5 - xorg-server-for-tests)) + (native-inputs (list extra-cmake-modules kdoctools pkg-config qtsvg + qttools + xorg-server-for-tests + python-minimal)) (inputs (list appmenu-gtk-module - appstream-qt + appstream-qt6 baloo breeze breeze-icons @@ -2389,9 +2719,12 @@ sensors, process information and other system resources.") fontconfig icu4c iso-codes - kactivities - kactivities-stats + plasma-activities + plasma-activities-stats karchive + kauth + ksvg + kstatusnotifieritem kcmutils kcoreaddons kcrash @@ -2400,17 +2733,21 @@ sensors, process information and other system resources.") kded kdesu kglobalaccel + kglobalacceld kguiaddons kholidays ki18n kiconthemes kidletime - kinit kio + xdotool + qqc2-desktop-style + qcoro-qt6 + kirigami-addons kio-extras - kio-fuse kitemmodels kirigami + kirigami-addons knewstuff knotifications knotifyconfig @@ -2434,6 +2771,7 @@ sensors, process information and other system resources.") libqalculate gmp mpfr + eudev libsm libxft libxkbcommon @@ -2442,17 +2780,17 @@ sensors, process information and other system resources.") networkmanager-qt phonon pipewire - plasma-framework + libplasma + plasma5support plasma-workspace-wallpapers plasma-wayland-protocols prison - qtbase-5 - qtdeclarative-5 - qtquickcontrols2-5 - qttools-5 - qtwayland-5 - qtgraphicaleffects - qtx11extras + qt5compat + qtsvg + qtshadertools + qtdeclarative + qttools + qtwayland wayland wayland-protocols xcb-util @@ -2461,7 +2799,7 @@ sensors, process information and other system resources.") xrdb xmessage xsetroot - polkit-qt + polkit-qt6 ucd libxcursor @@ -2470,43 +2808,35 @@ sensors, process information and other system resources.") zlib ;; qml dependency - qtquickcontrols-5 plasma-nm plasma-pa kscreen)) (arguments - (list #:phases + (list #:qtbase qtbase + #:configure-flags + #~(list + ;; libkmpris/autotests/CMakeLists.txt find it from + ;; KDE_INSTALL_FULL_LIBEXECDIR, But we are install to itself prefix. + ;; so we set it. + (string-append "-Dkglobalacceld_PATH=" + #$(this-package-input "kglobalacceld") + "/libexec/kglobalacceld")) + #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'patch-wallpaper - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "lookandfeel/sddm-theme/theme.conf.cmake" - (("background=..KDE_INSTALL_FULL_WALLPAPERDIR.") - (string-append "background=" - #$(this-package-input "breeze") - "/share/wallpapers"))))) (add-after 'unpack 'patch-workspace-bins (lambda* (#:key inputs #:allow-other-keys) (let ((xmessage (search-input-file inputs "/bin/xmessage")) (xsetroot (search-input-file inputs "/bin/xsetroot")) (xrdb (search-input-file inputs "/bin/xrdb")) - (kinit #$(this-package-input "kinit")) (qttools #$(this-package-input "qttools"))) (substitute* "startkde/startplasma.cpp" - (("xmessage") xmessage) + (("xmessage") xmessage)) + (substitute* "kcms/krdb/krdb.cpp" (("xsetroot") xsetroot)) (substitute* (list "kcms/fonts/fontinit.cpp" "kcms/fonts/fonts.cpp" "kcms/krdb/krdb.cpp") (("xrdb") xrdb)) - (substitute* "startkde/plasma-session/startup.cpp" - (("CMAKE_INSTALL_FULL_LIBEXECDIR_KF5..") - (string-append "\"" kinit - "/libexec/kf5"))) - (substitute* (list - "startkde/startplasma-wayland.cpp" - "startkde/startplasma-x11.cpp") - (("kdeinit5_shutdown") - (string-append kinit "/bin/kdeinit5_shutdown"))) ;; QT_INSTALL_BINS refers to qtbase, but qdbus is in ;; qttools. (substitute* "CMakeLists.txt" @@ -2525,19 +2855,30 @@ sensors, process information and other system resources.") (setenv "QT_QPA_PLATFORM" "offscreen") (setenv "QT_PLUGIN_PATH" (string-append #$output - "/lib/qt5/plugins:" + "/lib/qt6/plugins:" (getenv "QT_PLUGIN_PATH"))) - (setenv "QML2_IMPORT_PATH" + (setenv "QML_IMPORT_PATH" (string-append #$output - "/lib/qt5/qml:" - (getenv "QML2_IMPORT_PATH"))) + "/lib/qt6/qml:" + (getenv "QML_IMPORT_PATH"))) (invoke "dbus-launch" "ctest" "--output-on-failure" "--rerun-failed" "-E" - "(appstreamtest|tasksmodeltest|shelltest|\ -testimagefinder|systemtraymodeltest|testimagelistmodel|\ -testpackageimagelistmodel|testimageproxymodel|testslidemodel|testdesktop)"))))))) + "(appstreamtest|tasktoolstest|tasksmodeltest|\ +fetchinitialplayertest|mprisdeclarativetest|mediakeystest|shelltest|\ +locationsrunnertest|testimagefinder|testimagelistmodel|\ +testpackageimagelistmodel|testimageproxymodel|testslidemodel|testimagefrontend|\ +dbusservicewatchertest|klippertest|keystatetest|lockedtest|tst_triangleFilter|\ +testimagebackend)")))) + ;; share/dbus-1/system-services have same name file + ;; when dbus-root-service-type merge it, wail report + ;; "file exists". + (add-after 'install 'remove-dbus-service + (lambda _ + (delete-file + (string-append + #$output "/share/dbus-1/services/org.kde.fontinst.service"))))))) (home-page "https://invent.kde.org/plasma/plasma-workspace") (synopsis "Plasma workspace components") (description @@ -2548,14 +2889,14 @@ hardware management, and a high degree of customizability.") (define-public plasma-workspace-wallpapers (package (name "plasma-workspace-wallpapers") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "181q0mmmp3dygzafgh4qq2pwi5w15vw6mwc21nkl98qf6z773ify")))) + "0vm2v7hdfqcbxdl5gy3kx8az4q1y06iisf2rh5v4zc40vjjgf6cn")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules)) (home-page "https://community.kde.org/Frameworks") @@ -2564,18 +2905,56 @@ hardware management, and a high degree of customizability.") "This package provides wallpapers for the KDE desktop.") (license license:lgpl3+))) +(define-public print-manager + (package + (name "print-manager") + (version "6.1.2") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/plasma/" version + "/print-manager-" version ".tar.xz")) + (sha256 + (base32 "19gmqd48wjg9q8h57xdsa1d4nhvbp3h169v519pgw06lrrhia5hl")))) + (build-system qt-build-system) + (native-inputs + (list extra-cmake-modules)) + (inputs + (list cups + kcmutils + kconfig + kconfigwidgets + kcoreaddons + kdbusaddons + kiconthemes + kirigami + ki18n + kio + knotifications + kwidgetsaddons + kwindowsystem + libplasma + qtdeclarative)) + (arguments (list #:qtbase qtbase)) + (home-page "https://invent.kde.org/plasma/print-manager") + (synopsis "Manage print jobs and printers") + (description + "This package provides printing management for KDE.") + (license license:gpl2+))) + (define-public polkit-kde-agent (package (name "polkit-kde-agent") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/" name "-1-" version ".tar.xz")) (sha256 (base32 - "0p6gnv59mnb5y6riiifyg98sk8zycchv8bkf7x1332qa7zqhcjcc")))) + "1mr0fmmnvd92msrp0y1fib2hyjif4lycg74ycpiqylnxhvm6v4c8")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules)) (inputs (list ki18n kwindowsystem @@ -2584,7 +2963,8 @@ hardware management, and a high degree of customizability.") kcoreaddons kcrash kiconthemes - polkit-qt)) + polkit-qt6 + qtdeclarative)) (synopsis "Polkit authentication UI for Plasma") (description "This package contains a daemon providing a Polkit authentication @@ -2596,25 +2976,28 @@ UI for Plasma") (define-public powerdevil (package (name "powerdevil") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "151qhpf5j33jk3jhhxsr4zaf0z3f8xlnw8inmzf2a8lficiq9060")))) + "052hv22ps90sm44wrdf5f4x2iz633nypl75xjwv257pn6ravia6l")))) (build-system qt-build-system) - (native-inputs (list extra-cmake-modules qttools-5 pkg-config)) + (native-inputs (list extra-cmake-modules qttools pkg-config)) (inputs (list bluez-qt glib kauth - kactivities + plasma-activities kcmutils kscreen kidletime kconfig kdbusaddons + kxmlgui + kitemmodels + layer-shell-qt solid ki18n kcrash @@ -2631,7 +3014,13 @@ UI for Plasma") network-manager plasma-workspace eudev - qtx11extras)) + ddcutil + libxkbcommon)) + (arguments (list #:qtbase qtbase + #:phases #~(modify-phases %standard-phases + (add-before 'check 'setenv + (lambda _ + (setenv "HOME" (getcwd))))))) (synopsis "Manage power consumption") (description "This package provides the power consumption settings of a Plasma shell.") @@ -2641,14 +3030,14 @@ of a Plasma shell.") (define-public system-settings (package (name "system-settings") - (version "5.27.7") + (version "6.1.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/systemsettings-" version ".tar.xz")) (sha256 (base32 - "0vkcmb4sch97sq5xd8rj8z42qdcxy5ys758q6dl69kbv9hadl7bw")))) + "1dj6ic2i2pm01xyc1nl4k7v5r3rq1lwb638sfkbjch5g1gndsylh")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) (inputs (list kauth @@ -2666,27 +3055,15 @@ of a Plasma shell.") kdbusaddons kconfig kpackage - kactivities - kactivities-stats + plasma-activities + plasma-activities-stats kguiaddons kirigami knotifications krunner plasma-workspace - qtdeclarative-5 - ;; qml's indirect dependency - ;; XXX: make them propagated dependency runtime qml module - qtquickcontrols-5 - qtquickcontrols2-5 - kirigami-addons - qtgraphicaleffects - kdeclarative - kuserfeedback - knewstuff - plasma-pa - bluez-qt - kwin - bluedevil)) + qtdeclarative)) + (arguments (list #:qtbase qtbase)) (synopsis "Control center to configure Plasma Desktop") (description "This package provides configuration UI for Plasma Desktop.") (home-page "https://invent.kde.org/plasma/systemsettings") diff --git a/gnu/packages/kde-systemtools.scm b/gnu/packages/kde-systemtools.scm index 888fae10cb..4923854a7c 100644 --- a/gnu/packages/kde-systemtools.scm +++ b/gnu/packages/kde-systemtools.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2022 Brendan Tildesley <mail@brendan.scot> ;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com> -;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2023, 2024 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -40,28 +40,30 @@ #:use-module (gnu packages ruby) #:use-module (gnu packages search) #:use-module (gnu packages vnc) + #:use-module (gnu packages perl) #:use-module (gnu packages xml) #:use-module (gnu packages icu4c) - #:use-module (gnu packages xorg)) + #:use-module (gnu packages xorg) + #:use-module (gnu packages xdisorg)) (define-public dolphin (package (name "dolphin") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/dolphin-" version ".tar.xz")) (sha256 - (base32 "0bys24i2a3a65ahq5p3q1zr2px8jqip1gjn5m7rngq4hcddb1ji8")))) + (base32 "0rrmbzrywv19z93b9291r863dm7panz65cf10lzgjqzlsx7hm1az")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules kdoctools ruby ruby-test-unit)) (inputs (list baloo baloo-widgets - kactivities + plasma-activities kbookmarks kcmutils kcompletion @@ -71,7 +73,6 @@ kdbusaddons ki18n kiconthemes - kinit kio knewstuff knotifications @@ -81,11 +82,11 @@ kwindowsystem breeze-icons ;; default icon set phonon - qtbase-5 - qtx11extras - solid)) + solid + libxkbcommon)) (arguments - `(#:tests? #f)) ;; TODO: 4/15 tests fail even with offscreen + (list #:qtbase qtbase + #:tests? #f)) ;; TODO: 4/15 tests fail even with offscreen (home-page "https://apps.kde.org/dolphin/") (synopsis "File manager for KDE") (description "Dolphin is a file manager for KDE focusing on usability. @@ -105,14 +106,14 @@ The main features of Dolphin are: (define-public dolphin-plugins (package (name "dolphin-plugins") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/dolphin-plugins-" version ".tar.xz")) (sha256 - (base32 "0h1b559icj5g3xrx5697a9rncpdcmsjg774c6m36ild56bwc048v")))) + (base32 "08xyjjwkcr08ncc4xrj65c44iya4byvf1xhnwjg21i7zxls51zir")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) @@ -121,10 +122,12 @@ The main features of Dolphin are: ki18n kio ktexteditor + ktextwidgets ksyntaxhighlighting kxmlgui breeze-icons ;; default icon set - qtbase-5)) + qt5compat)) + (arguments (list #:qtbase qtbase)) (home-page "https://www.kde.org/") (synopsis "VCS-Plugins for Dolphin") (description "This package contains plugins that offer integration in @@ -134,49 +137,56 @@ Dolphin with the version control systems: Bzr, Git, Mercurial, Subversion.") (define-public khelpcenter (package (name "khelpcenter") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/khelpcenter-" version ".tar.xz")) (sha256 - (base32 "10rivj5c14v5hwk87z41gwk830sy35fz0jg1jpay43jzw0ss995y")))) + (base32 "0y6smxc64mxpv535rih1m50wy4lf4gzsp944snvxrb4gj8q9sgy1")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules kdoctools)) + (list extra-cmake-modules kdoctools perl)) (inputs - (list grantlee - karchive + (list karchive kbookmarks kcodecs kconfig kcoreaddons kdbusaddons - khtml ki18n - kinit kio - kjs kparts kservice + ktexttemplate kwindowsystem libxml2 breeze-icons ;; default icon set - qtbase-5 - xapian)) + qtbase + xapian + qtwebengine)) (arguments - (list #:tests? #f ;;1/1 test fails - #:phases #~(modify-phases %standard-phases - (add-after 'install 'wrap-executable - (lambda* (#:key inputs #:allow-other-keys) - ;; Since qt-wrap selectors do not wrap for /share/kf5 - ;; directories, we need this so khelpcenter can find html4.css. - (wrap-program (string-append #$output - "/bin/khelpcenter") - `("XDG_DATA_DIRS" suffix - (,(string-append (assoc-ref inputs "khtml") - "/share"))))))))) + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'add-miss-package + (lambda _ + ;; https://invent.kde.org/system/khelpcenter/-/merge_requests/50 + (substitute* "CMakeLists.txt" + ((" WebEngineWidgets") + " WebEngineWidgets + PrintSupport") + (("Qt6::WebEngineWidgets") + "Qt6::PrintSupport + Qt6::WebEngineWidgets")))) + (add-after 'install 'wrap-executable + (lambda* (#:key inputs #:allow-other-keys) + (wrap-program (string-append #$output + "/bin/khelpcenter") + `("QTWEBENGINEPROCESS_PATH" = + (,(search-input-file + inputs + "lib/qt6/libexec/QtWebEngineProcess"))))))))) (home-page "https://apps.kde.org/khelpcenter/") (synopsis "KDE documentation viewer") (description "KHelpCenter uses meta data files which describe the @@ -193,20 +203,19 @@ document meta data file.") (define-public konsole (package (name "konsole") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/konsole-" version ".tar.xz")) (sha256 - (base32 "1k68y1i3g3bsz1dz81jhkx1q2fb13rbm5ywh632bcyln0c6l0vz0")))) + (base32 "1549a5cpg6g6djbln38nlngl1xcfn7p9bjsscbwl27jkz8dyy18x")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules kdoctools zlib)) (inputs (list kbookmarks - kcompletion kconfig kconfigwidgets kcoreaddons @@ -215,7 +224,6 @@ document meta data file.") kguiaddons ki18n kiconthemes - kinit kio knewstuff kglobalaccel @@ -229,12 +237,12 @@ document meta data file.") kwindowsystem kxmlgui breeze-icons ;; default icon set - qtbase-5 - qtscript - qtmultimedia-5 + qt5compat + qtmultimedia icu4c)) (arguments - `(#:tests? #f)) ;; TODO: 2/15 tests fail even with HOME, offscreen, SHELL, debus + (list #:qtbase qtbase + #:tests? #f)) ;; TODO: 2/15 tests fail even with HOME, offscreen, SHELL, debus (home-page "https://www.kde.org/") (synopsis "Terminal emulator similar for KDE") (description "Konsole is a terminal emulator, similar to xterm, built on @@ -249,17 +257,22 @@ This package is part of the KDE base applications module.") (define-public krfb (package (name "krfb") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/krfb-" version ".tar.xz")) (sha256 - (base32 "0qbrvf2wa3af1z1dpq3pqkngfbrfdgqfz8xs1qpdpyb7jxnphry7")))) + (base32 "11mp4vkadcrf20wdlwncsmyqdk9cj2ys85jjz0iaik9dfivgqcci")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase + #:configure-flags + #~(list (string-append "-DQtWaylandScanner_EXECUTABLE=" + #$(this-package-native-input "qtwayland") + "/lib/qt6/libexec/qtwaylandscanner")))) (native-inputs - (list extra-cmake-modules pkg-config kdoctools)) + (list extra-cmake-modules pkg-config kdoctools qtwayland)) (inputs (list kcompletion kconfig @@ -270,6 +283,7 @@ This package is part of the KDE base applications module.") ki18n knotifications kpipewire + kstatusnotifieritem kwallet kwayland kwidgetsaddons @@ -281,11 +295,10 @@ This package is part of the KDE base applications module.") breeze-icons ;; default icon set pipewire plasma-wayland-protocols - qtbase-5 - qtwayland-5 - qtx11extras + qtwayland wayland xcb-util-image + libxkbcommon zlib)) (home-page "https://apps.kde.org/krfb/") (synopsis "Desktop Sharing utility") @@ -304,20 +317,22 @@ This package is part of the KDE networking module.") (define-public ksystemlog (package (name "ksystemlog") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/ksystemlog-" version ".tar.xz")) (sha256 - (base32 "15c1h1dlcgbx2adhjzry2zwia0alym7vc251zymyzhl2xjacvqlm")))) + (base32 "1zlzyq5sv8mn4g0ycyrppr4fkr67vym79va7rfa7kbvvjgpwh6gi")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs ;; Not including Journald since this is not used in guix - (list karchive + (list breeze-icons ;; default icon set + karchive kcompletion kconfig kcoreaddons @@ -327,9 +342,7 @@ This package is part of the KDE networking module.") kitemviews ktextwidgets kwidgetsaddons - kxmlgui - breeze-icons ;; default icon set - qtbase-5)) + kxmlgui)) (home-page "https://apps.kde.org/ksystemlog/") (synopsis "System log viewer") (description "This program is developed for being used by beginner users, @@ -343,14 +356,14 @@ This package is part of the KDE administration module.") (define-public kwalletmanager (package (name "kwalletmanager") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kwalletmanager-" version ".tar.xz")) (sha256 - (base32 "1g3yw32kv7yij2ymk52fpp0srncr2ijfckfvz5hc0nsn7xhyqdby")))) + (base32 "1z62bglwd8fk5ah11g6lyw3qr5qlvgyrwz1bgrnzrz18pjr9sm63")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules kdoctools)) @@ -368,10 +381,12 @@ This package is part of the KDE administration module.") kjobwidgets knotifications kservice + kstatusnotifieritem ktextwidgets kwallet kwindowsystem kxmlgui)) + (arguments (list #:qtbase qtbase)) (home-page "https://apps.kde.org/kwalletmanager5/") (synopsis "Tool to manage passwords on KWallet") (description @@ -381,17 +396,18 @@ This package is part of the KDE administration module.") (define-public spectacle (package (name "spectacle") - (version "23.04.3") + (version "24.02.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/spectacle-" version ".tar.xz")) (sha256 - (base32 "1fyklcvz0zndxabflkka75rham6768rp01as7m5dv0ic4lipkf9m")))) + (base32 "0li1fhhvqk5y1j0jpazhjw1qh5mnwzn4dkl85bmlsn5hbqszf621")))) (build-system qt-build-system) (arguments - (list #:phases + (list #:qtbase qtbase + #:phases #~(modify-phases %standard-phases (replace 'check (lambda* (#:key tests? #:allow-other-keys) @@ -414,18 +430,18 @@ This package is part of the KDE administration module.") kwidgetsaddons kwindowsystem kxmlgui - libxcb purpose - qtdeclarative-5 - qtquickcontrols2-5 - qtwayland-5 - qtx11extras + layer-shell-qt + qtdeclarative + qtmultimedia + qtwayland wayland wayland-protocols plasma-wayland-protocols xcb-util xcb-util-cursor - xcb-util-image)) + xcb-util-image + libxkbcommon)) (home-page "https://apps.kde.org/spectacle/") (synopsis "Screenshot capture utility for KDE") (description "Spectacle is a screenshot taking utility for the KDE.") @@ -434,14 +450,14 @@ This package is part of the KDE administration module.") (define-public yakuake (package (name "yakuake") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/yakuake-" version ".tar.xz")) (sha256 (base32 - "17ylm5z5lzjq5g4d48s0clpl3hg4rym9sc1p5hr0wfs9jx7197jy")))) + "0bgpnvq1dpijrz3vj7yjw5dkss98l22iirqrvih3wgm0n6ccaix2")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) @@ -461,12 +477,13 @@ This package is part of the KDE administration module.") knotifyconfig konsole kparts + kstatusnotifieritem kwayland kwidgetsaddons kwindowsystem - qtbase-5 - qtsvg-5 - qtx11extras)) + libxkbcommon + qtsvg)) + (arguments (list #:qtbase qtbase)) (home-page "https://apps.kde.org/yakuake/") (synopsis "Quad-style terminal emulator for KDE") (description "Yakuake is a drop-down terminal emulator based on KDE Konsole diff --git a/gnu/packages/kde-utils.scm b/gnu/packages/kde-utils.scm index 6001607ad6..807f6fe14d 100644 --- a/gnu/packages/kde-utils.scm +++ b/gnu/packages/kde-utils.scm @@ -45,6 +45,7 @@ #:use-module (gnu packages kde) #:use-module (gnu packages kde-frameworks) #:use-module (gnu packages kde-plasma) + #:use-module (gnu packages python) #:use-module (gnu packages qt) #:use-module (gnu packages samba) #:use-module (gnu packages xdisorg) @@ -53,42 +54,44 @@ (define-public ark (package (name "ark") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/ark-" version ".tar.xz")) (sha256 (base32 - "081swq9f87yxg4dxdl5i4hszhr0q4ph402in397zfa5vpyspzy41")) + "1q0fyx65gp0d1vj4jxiaswdfzi15hbfi537f3i8y277b621qp3rs")) ;; The libarchive package in Guix does not support ;; xar; disable related tests. (patches (search-patches "ark-skip-xar-test.patch")))) (build-system qt-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'check 'start-xserver - ;; adddialogtest requires DISPLAY. - (lambda* (#:key inputs #:allow-other-keys) - (let ((xorg-server (assoc-ref inputs "xorg-server"))) - (setenv "HOME" (getcwd)) - (system (format #f "~a/bin/Xvfb :1 &" xorg-server)) - (setenv "DISPLAY" ":1")))) - (add-after 'install 'wrap-executable - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (lrzip (assoc-ref inputs "lrzip")) - (lzop (assoc-ref inputs "lzop")) - (p7zip (assoc-ref inputs "p7zip")) - (unzip (assoc-ref inputs "unzip")) - (zip (assoc-ref inputs "zip")) - (zstd (assoc-ref inputs "zstd"))) - (wrap-program (string-append out "/bin/ark") - `("PATH" suffix - ,(map (lambda (p) - (string-append p "/bin")) - (list lrzip lzop p7zip unzip zip zstd)))))))))) + (list + #:qtbase qtbase + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'start-xserver + ;; adddialogtest requires DISPLAY. + (lambda* (#:key inputs #:allow-other-keys) + (let ((xorg-server (assoc-ref inputs "xorg-server"))) + (setenv "HOME" (getcwd)) + (system (format #f "~a/bin/Xvfb :1 &" xorg-server)) + (setenv "DISPLAY" ":1")))) + (add-after 'install 'wrap-executable + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (lrzip (assoc-ref inputs "lrzip")) + (lzop (assoc-ref inputs "lzop")) + (p7zip (assoc-ref inputs "p7zip")) + (unzip (assoc-ref inputs "unzip")) + (zip (assoc-ref inputs "zip")) + (zstd (assoc-ref inputs "zstd"))) + (wrap-program (string-append out "/bin/ark") + `("PATH" suffix + ,(map (lambda (p) + (string-append p "/bin")) + (list lrzip lzop p7zip unzip zip zstd)))))))))) (native-inputs (list extra-cmake-modules pkg-config kdoctools xorg-server)) (inputs @@ -98,7 +101,6 @@ kconfig kcrash kdbusaddons - khtml ki18n kiconthemes kio @@ -107,9 +109,9 @@ kpty kservice kwidgetsaddons + kfilemetadata libarchive libzip - qtbase-5 zlib ;; Command line tools used by Ark. lrzip @@ -142,10 +144,10 @@ well as CD-ROM images.") "00jccpwvksyp2vr3fjxajs8d9d30rspg4zj6rnj8dai96alp303k")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules pkg-config)) - (inputs (list ki18n - kxmlgui - kconfigwidgets - ktexteditor + (inputs (list ki18n-5 + kxmlgui-5 + kconfigwidgets-5 + ktexteditor-5 libatcore qt3d-5 qtbase-5 @@ -211,9 +213,9 @@ well as CD-ROM images.") (license license:gpl2+)))) (define-public fielding - (let ((commit "6b3c5d67b308e9e7e2043dc6072bfd265ec9f3e1") + (let ((commit "4ee9aea59718851125edcac71e2e4fdc5a592ed9") ;; no releases yet - (revision "1")) + (revision "2")) (package (name "fielding") (version (git-version "0.1-pre" revision commit)) @@ -225,18 +227,19 @@ well as CD-ROM images.") (file-name (git-file-name name version)) (sha256 (base32 - "1l16am7il7kprmy8irpzj04rb8wbfr84y49wp4i74hspp9xkfick")))) + "04gzp4bch4k2cvjk0mjcrmjpi986j5bqz3l4xcqykfwbgd08kas2")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) (inputs (list kirigami + kirigami-addons kcoreaddons kconfig ki18n kdbusaddons ksyntaxhighlighting - qtdeclarative-5 - qtquickcontrols2-5 - qtsvg-5)) + qtdeclarative + qtsvg)) + (arguments (list #:qtbase qtbase)) (home-page "https://invent.kde.org/utilities/fielding") (synopsis "REST API testing tool") (description @@ -246,26 +249,26 @@ well as CD-ROM images.") (define-public filelight (package (name "filelight") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/filelight-" version ".tar.xz")) (sha256 (base32 - "1mwl1dkknvqw9hd5jsh4cdx1zd8f6rxca0vyq01wrx44q9p6dn1n")))) + "0mibgqhab7cbis0vw89f5y73185jq1dgmcsqdd8g4clkglgvdlrk")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) (inputs (list kirigami + kirigami-addons kquickcharts kxmlgui kio ki18n kdeclarative qqc2-desktop-style - qtgraphicaleffects - qtquickcontrols2-5 - qtsvg-5)) + qtsvg)) + (arguments (list #:qtbase qtbase)) (home-page "https://apps.kde.org/filelight/") (synopsis "Visualize the disk usage") (description "Filelight is an application to visualize the disk usage on @@ -273,41 +276,39 @@ your computer.") (license license:lgpl2.1+))) (define-public francis - (let ((commit "d2c762ad94170430a667ee57f81ec9dbe498642c") ; no release yet - (revision "1")) - (package - (name "francis") - (version (git-version "0.1-pre" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://invent.kde.org/utilities/francis") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "15bk5iq127mp34n9fzq4d5r3qss3ihk93lqy86z2q3lgwid26s0h")))) - (build-system qt-build-system) - (native-inputs (list extra-cmake-modules)) - (inputs (list kirigami - kcoreaddons - kconfig - ki18n - kdbusaddons - knotifications - qtdeclarative-5 - qtgraphicaleffects - qtquickcontrols2-5 - qtsvg-5)) - (home-page "https://invent.kde.org/utilities/francis") - (synopsis "Track your time") - (description "This package provides time tracking.") - (license license:lgpl2.1+)))) + (package + (name "francis") + (version "24.05.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://invent.kde.org/utilities/francis") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0lm0gh035qc9ip9hs00gxl3y9d9a8846ggypzgzngkqazic9i82k")))) + (build-system qt-build-system) + (native-inputs (list extra-cmake-modules)) + (inputs (list kirigami + kirigami-addons + kcoreaddons + kconfig + ki18n + kdbusaddons + knotifications + qtdeclarative + qtsvg)) + (arguments (list #:qtbase qtbase)) + (home-page "https://invent.kde.org/utilities/francis") + (synopsis "Track your time") + (description "This package provides time tracking.") + (license license:lgpl2.1+))) (define-public isoimagewriter (package (name "isoimagewriter") - (version "1.0.0") + (version "24.05.2") (source (origin (method git-fetch) (uri (git-reference @@ -316,7 +317,7 @@ your computer.") (file-name (git-file-name name version)) (sha256 (base32 - "1iphp2krgadc175570iiyaxbnjgpc1xilc71gkcbn5n0yd7qmkbv")))) + "1v8ggdgij503m3bm1w24840al5by7y62p8yrmhlk4g0hjacmkys7")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) (inputs (list kauth @@ -327,6 +328,7 @@ your computer.") kcrash solid kwidgetsaddons)) + (arguments (list #:qtbase qtbase)) (home-page "https://invent.kde.org/utilities/isoimagewriter") (synopsis "Write hybrid ISO files onto USB disks") (description @@ -336,19 +338,20 @@ your computer.") (define-public kate (package (name "kate") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kate-" version ".tar.xz")) (sha256 - (base32 "0yyhh21pvzsaz7swmghdchzsfk089axhqkjwjv1m8j4q3q3rhv86")))) + (base32 "085hbl6xzzihnhy8pjwdjdsrww6l1h70m4sf2s1b5c1xsnvhhkvp")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules kdoctools)) (inputs - (list kactivities + (list breeze-icons ;; default icon set + plasma-activities kconfig kcrash kdbusaddons @@ -362,30 +365,29 @@ your computer.") kjobwidgets kparts ktexteditor + ktextwidgets ksyntaxhighlighting kwallet - plasma-framework kwindowsystem kxmlgui - breeze-icons ;; default icon set - qtbase-5 - qtscript - qtx11extras)) + libplasma + libxkbcommon)) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-tests - (lambda* (#:key inputs #:allow-other-keys) - ;; This test requires a 'bin' diretory under '/usr'. - (substitute* "addons/externaltools/autotests/externaltooltest.cpp" - (("QStringLiteral[(]\"/usr\"[)]") - (format #f "QStringLiteral(\"~a\")" - (dirname (dirname (which "ls")))))))) - (add-before 'check 'check-setup - (lambda _ - ;; make Qt render "offscreen", required for tests - (setenv "QT_QPA_PLATFORM" "offscreen") - (setenv "HOME" (getcwd))))))) + (list #:qtbase qtbase + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-tests + (lambda* (#:key inputs #:allow-other-keys) + ;; This test requires a 'bin' diretory under '/usr'. + (substitute* "addons/externaltools/autotests/externaltooltest.cpp" + (("QStringLiteral[(]\"/usr\"[)]") + (format #f "QStringLiteral(\"~a\")" + (dirname (dirname (which "ls")))))))) + (add-before 'check 'check-setup + (lambda _ + ;; make Qt render "offscreen", required for tests + (setenv "QT_QPA_PLATFORM" "offscreen") + (setenv "HOME" (getcwd))))))) (home-page "https://kate-editor.org/") (synopsis "Multi-document, multi-view text editor") (description "Kate is a powerful text editor that can open multiple files @@ -409,7 +411,7 @@ Kate's features include: (define-public kdebugsettings (package (name "kdebugsettings") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" @@ -417,7 +419,7 @@ Kate's features include: ".tar.xz")) (sha256 (base32 - "02igg8ry1cxa83pdj6pgwzw7hpjwfrfk57d9ybgfvy2x08d5kvqz")))) + "1il9jcwya1hgqrs5yrlahk9h0hrrs5h1ay304sbixgiiafx1dcv7")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) (inputs (list kcoreaddons @@ -428,6 +430,7 @@ Kate's features include: kitemviews kcompletion kxmlgui)) + (arguments (list #:qtbase qtbase)) (home-page "https://invent.kde.org/utilities/kdebugsettings") (synopsis "Choose which QLoggingCategory are displayed") (description @@ -437,14 +440,14 @@ Kate's features include: (define-public kbackup (package (name "kbackup") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kbackup-" version ".tar.xz")) (sha256 (base32 - "121w54ivmq8qnxc97g47i8vq4nkivypp84pqs9rs5bid4cpfvh9p")))) + "0s75il0hxs95sdmj3jll8rdl1n8y86qgwww15idda18yww8d0bwm")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) (inputs (list kguiaddons @@ -455,8 +458,11 @@ Kate's features include: kiconthemes karchive kwidgetsaddons + kstatusnotifieritem libarchive - shared-mime-info)) + shared-mime-info + qt5compat)) + (arguments (list #:qtbase qtbase)) (home-page "https://apps.kde.org/kbackup/") (synopsis "Backup program with an easy-to-use interface") (description @@ -473,15 +479,16 @@ drive, USB stick, etc (define-public kcalc (package (name "kcalc") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kcalc-" version ".tar.xz")) (sha256 (base32 - "04mqicwqn6h99jgh1zl0wsgk1rdkswzxaq8b8yz5hq654dsyq6y1")))) + "0p1m3yv52dc2mzalk19l3zpdwpwi5jg0fib5lgb1ln71kwb07y8n")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs (list gmp kcoreaddons @@ -502,7 +509,7 @@ drive, USB stick, etc (define-public kcharselect (package (name "kcharselect") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" @@ -510,8 +517,9 @@ drive, USB stick, etc ".tar.xz")) (sha256 (base32 - "05z80j8bwrj1zfpy376gsx30bv7bxsa3lyvrqsz197w1g8vp5gix")))) + "0yzw3jqcxkqi3ricsxcj1g8lhwxqjx0vwa91h4jb7ig1gsp6h3hi")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules)) (inputs (list kbookmarks kcoreaddons kcrash ki18n kwidgetsaddons kxmlgui)) (home-page "https://apps.kde.org/kcharselect/") @@ -526,15 +534,16 @@ characters.") (define-public kdialog (package (name "kdialog") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kdialog-" version ".tar.xz")) (sha256 (base32 - "042az7d9ngar6xp7gv3xcmlns9hpbvs39dkymanqgc0riwa1mvsx")))) + "06h42dlchikn0xva93yj2y46gmcqb78lm0qim30q25fnz5hbfv5f")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs (list ktextwidgets knotifications @@ -550,8 +559,8 @@ shell scripts.") (license license:gpl2+))) (define-public keurocalc - (let ((commit "a760d8a7e58b36eb72d15e847f96599c93785194") ; just one release - (revision "1")) + (let ((commit "c6e83859624de10210ad6b839c473dd8ea7a0e83") ; just one release + (revision "2")) (package (name "keurocalc") (version (git-version "1.3.0" revision commit)) @@ -563,7 +572,7 @@ shell scripts.") (file-name (git-file-name name version)) (sha256 (base32 - "0gh5vwl38hwf1405c980j1fj06g5c52am140lf4mxhrjvnmry7kd")))) + "040x28lnirwply5ph5xz3jcmx7c10qifmwcjgvqymlgqhcfkda0r")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules kdoctools)) (inputs (list kconfig @@ -573,6 +582,7 @@ shell scripts.") kio kwidgetsaddons kxmlgui)) + (arguments (list #:qtbase qtbase)) (home-page "https://invent.kde.org/utilities/keurocalc") (synopsis "Currency conversion tool") (description "This package provides a utility to handle currency @@ -582,25 +592,25 @@ conversions between European currencies.") (define-public keysmith (package (name "keysmith") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/keysmith-" version ".tar.xz")) (sha256 (base32 - "1rfp516adliyc57nx4ha1rp8v2z340ygsvblh5sqmsdsg2ivjklj")))) + "1n34sda27hpl53gayglrjyz8la8g25z8mrvaymwhcp8fzpids911")))) (build-system qt-build-system) - (native-inputs (list extra-cmake-modules pkg-config)) + (native-inputs (list extra-cmake-modules pkg-config python-minimal)) (inputs (list kdbusaddons kirigami ki18n kwindowsystem libsodium - qtdeclarative-5 - qtgraphicaleffects - qtquickcontrols2-5 - qtsvg-5)) + qqc2-desktop-style + qtsvg + qtdeclarative)) + (arguments (list #:qtbase qtbase)) (home-page "https://invent.kde.org/utilities/keysmith") (synopsis "OTP client for Plasma Mobile and Desktop") (description @@ -611,22 +621,25 @@ with support for QR scanning.") (define-public kfind (package (name "kfind") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kfind-" version ".tar.xz")) (sha256 (base32 - "03g9cn0wp3f2n9zwzbc5sbcria4hcp2ls77fbxyj3wkady3m50if")))) + "18r0fkv5dnl1l23c94igf09g71z3pk571hh1ff4df9ixajyvw43b")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs (list karchive kcoreaddons kfilemetadata + kxmlgui ki18n kio - kwidgetsaddons)) + kwidgetsaddons + qt5compat)) (home-page "https://apps.kde.org/kfind/") (synopsis "File search utility") (description @@ -657,17 +670,17 @@ with support for QR scanning.") (("gstreamer-video-1.0") ""))))))) (native-inputs (list extra-cmake-modules pkg-config)) - (inputs (list kconfigwidgets - kcoreaddons - ki18n - kirigami - kcrash - kdnssd + (inputs (list kconfigwidgets-5 + kcoreaddons-5 + ki18n-5 + kirigami-5 + kcrash-5 + kdnssd-5 qtquickcontrols2-5 qtgraphicaleffects qtdeclarative-5 qtgamepad - qtlocation)) + qtlocation-5)) (propagated-inputs (list gstreamer)) (home-page "https://apps.kde.org/kirogi/") (synopsis "Ground control application for drones") @@ -683,28 +696,29 @@ with support for QR scanning.") @item Support for Parrot (Anafi, Bebop 2) and Ryze Tello drones @end itemize") (license ;GPL for programs, LGPL for libraries - (list license:gpl2+ license:lgpl2.0))))) + (list license:gpl2+ license:lgpl2.0))))) (define-public kontrast (package (name "kontrast") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kontrast-" version ".tar.xz")) (sha256 (base32 - "08qwvc2b5bj3012lvwxainbw7d34mkbwwznj3661ydsnfjyxxs92")))) + "0rn7nw686d773hx6dg1zvld89r0l9gg4fps3ipyhlwi8gwcm1dwl")))) (build-system qt-build-system) - (native-inputs (list extra-cmake-modules kdoctools)) + (arguments (list #:qtbase qtbase)) + (native-inputs (list extra-cmake-modules kdoctools python-minimal)) (inputs (list kirigami ki18n kcoreaddons - qtdeclarative-5 - qtgraphicaleffects - qtquickcontrols2-5 - qtsvg-5)) + qtdeclarative + futuresql + qcoro-qt6 + qtsvg)) (home-page "https://apps.kde.org/kontrast/") (synopsis "Color contrast checker") (description @@ -759,17 +773,17 @@ the computer and 3D Printers.") (lambda* (#:key tests? #:allow-other-keys) (when tests? (invoke "dbus-launch" "ctest" "-E" - "(Test.KDED.DBusTabletService|Test.KDED.TabletHandler|Test.KDED.XInputAdaptor|Test.KDED.XsetWacomAdaptor)"))))))) - (native-inputs (list dbus extra-cmake-modules kdoctools pkg-config)) - (inputs (list kcoreaddons - ki18n - kglobalaccel - kconfig - kxmlgui - kwidgetsaddons - kwindowsystem - knotifications - kdbusaddons + "(Test.KDED.DBusTabletService|Test.KDED.TabletHandler|Test.KDED.XInputAdaptor|Test.KDED.XsetWacomAdaptor)"))))))) + (native-inputs (list dbus extra-cmake-modules kdoctools-5 pkg-config)) + (inputs (list kcoreaddons-5 + ki18n-5 + kglobalaccel-5 + kconfig-5 + kxmlgui-5 + kwidgetsaddons-5 + kwindowsystem-5 + knotifications-5 + kdbusaddons-5 qtx11extras qtdeclarative-5 libwacom @@ -784,15 +798,16 @@ the computer and 3D Printers.") (define-public kmag (package (name "kmag") - (version "23.04.3") + (version "24.05.2") (source (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/release-service/" version - "/src/kmag-" version ".tar.xz")) - (sha256 - (base32 "13ar37yv3gk5451cdqrgbm91jm50qw4559sx25fv95g2i9wa7z74")))) + (method url-fetch) + (uri (string-append "mirror://kde/stable/release-service/" version + "/src/kmag-" version ".tar.xz")) + (sha256 + (base32 "0sbm9jr0spywgvm136swgbdqrw23dsf2msbj8x9sv4j004nx7sww")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -800,8 +815,7 @@ the computer and 3D Printers.") kio kxmlgui breeze-icons ;; default icon set - ;; TODO: QAccessibilityClient - libqaccessibilityclien - qtbase-5)) + libqaccessibilityclient)) (home-page "https://apps.kde.org/kmag/") (synopsis "Screen magnifier tool") (description "You can use KMagnifier to magnify a part of the screen just @@ -814,19 +828,20 @@ artists to web-designers to people with low vision.") (define-public kmousetool (package (name "kmousetool") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kmousetool-" version ".tar.xz")) (sha256 - (base32 "1prh9xdzwx0mx93g9cbjy55hxwcci90hvrv2ckj4dqdnv5fv4h21")))) + (base32 "1vhabwsi1iiliakyqdaxjlzx9n7ln08szrr1l6hyi7abvzaarp8p")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules kdoctools)) (inputs - (list kauth + (list breeze-icons ;; default icon set + kauth kcoreaddons kconfigwidgets kdbusaddons @@ -835,11 +850,12 @@ artists to web-designers to people with low vision.") knotifications kxmlgui kwindowsystem + kstatusnotifieritem libxtst libxt phonon - breeze-icons ;; default icon set - qtbase-5)) + qtmultimedia)) + (arguments (list #:qtbase qtbase)) (home-page "https://apps.kde.org/kmousetool/") (synopsis "Automatic mouse click and mouse manipulation tool for the disabled") @@ -852,14 +868,14 @@ whom pressing buttons hurts.") (define-public kmouth (package (name "kmouth") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kmouth-" version ".tar.xz")) (sha256 - (base32 "0qyzq4cvcsacb7hr6n79i3rzyjr0m3c8lrf8fwbzdivswpk8wss3")))) + (base32 "1gd51vwa9xdxxi6idzgzfb9dapirp5xc9alf3d9xnliwxqfxiv3x")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules kdoctools)) @@ -874,8 +890,8 @@ whom pressing buttons hurts.") kwidgetsaddons kxmlgui breeze-icons ;; default icon set - qtbase-5 - qtspeech-5)) + qtspeech)) + (arguments (list #:qtbase qtbase)) (home-page "https://apps.kde.org/kmouth/") (synopsis "Type-and-say frontend for speech synthesizers") (description "KMouth is a program which enables persons that cannot speak @@ -901,16 +917,16 @@ sentences to be re-spoken.") (base32 "0xn4z9y2yl57a5skwp4cjsn1456kiwnwvhrddc0qsihgdyif3fbm")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules kdoctools)) + (list extra-cmake-modules kdoctools-5)) (inputs - (list kauth - kconfig - kconfigwidgets - kcoreaddons - kcrash - ki18n - kwidgetsaddons - kxmlgui + (list kauth-5 + kconfig-5 + kconfigwidgets-5 + kcoreaddons-5 + kcrash-5 + ki18n-5 + kwidgetsaddons-5 + kxmlgui-5 breeze-icons ;; default icon set qtbase-5)) (home-page "https://apps.kde.org/kronometer/") @@ -924,14 +940,14 @@ to save the times and resume them later.") (define-public krusader (package (name "krusader") - (version "2.8.0") + (version "2.8.1") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/krusader/" version "/krusader-" version ".tar.xz")) (sha256 - (base32 "16n2y861ka8jhackf7hd9b0b0argifc1p0a114dvrc0qjddg0k4f")))) + (base32 "10w2y66kapd0ii8lr37jjwgg2a623ds05bv416j1payh352j1grp")))) (build-system qt-build-system) (arguments (list #:phases @@ -943,29 +959,29 @@ to save the times and resume them later.") (("# include <kcompletion_version\\.h>") "") (("# include <karchive_version\\.h>") ""))))))) (native-inputs - (list extra-cmake-modules kdoctools)) + (list extra-cmake-modules kdoctools-5)) (inputs - (list karchive - kbookmarks - kcodecs - kcompletion - kconfig - kcoreaddons - kguiaddons - ki18n - kiconthemes - kio - kitemviews - knotifications - kparts - ktextwidgets - kwallet - kwidgetsaddons - kwindowsystem - kxmlgui + (list karchive-5 + kbookmarks-5 + kcodecs-5 + kcompletion-5 + kconfig-5 + kcoreaddons-5 + kguiaddons-5 + ki18n-5 + kiconthemes-5 + kio-5 + kitemviews-5 + knotifications-5 + kparts-5 + ktextwidgets-5 + kwallet-5 + kwidgetsaddons-5 + kwindowsystem-5 + kxmlgui-5 breeze-icons ;; default icon set qtbase-5 - solid + solid-5 zlib)) (home-page "https://krusader.org/") (synopsis "Twin-panel (commander-style) file manager") @@ -997,9 +1013,9 @@ great on your desktop.") (base32 "1q6blvcqz6hxdfrkdi0fplmz7rmk3im56kpp68r0yrivhx3hn8sc")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules kdoctools pkg-config)) + (list extra-cmake-modules kdoctools-5 pkg-config)) (inputs - (list ktexteditor imagemagick qtbase-5 qtx11extras)) + (list ktexteditor-5 imagemagick qtbase-5 qtx11extras)) (home-page "https://apps.kde.org/kxstitch/") (synopsis "Create and print cross stitch patterns") (description @@ -1010,33 +1026,33 @@ either be created or generated from a image.") (define-public okteta (package (name "okteta") - (version "0.26.12") + (version "0.26.15") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/okteta/" version "/src/okteta-" version ".tar.xz")) (sha256 - (base32 "18bj8gd9kvdk85ypykl668safiyqn5qskgrsb214wxxaprl6phj9")))) + (base32 "0qvwryk8m2ixxn9f6xgjiy3nv0vffapkgx8qw9315306yw750cq5")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules kdoctools qttools-5 shared-mime-info)) + (list extra-cmake-modules kdoctools-5 qttools-5 shared-mime-info)) (inputs - (list kbookmarks - kcmutils - kcodecs - kcrash - kcompletion - kconfigwidgets - kdbusaddons - ki18n - kiconthemes - kio - knewstuff - kparts - kservice - kwidgetsaddons - kxmlgui + (list kbookmarks-5 + kcmutils-5 + kcodecs-5 + kcrash-5 + kcompletion-5 + kconfigwidgets-5 + kdbusaddons-5 + ki18n-5 + kiconthemes-5 + kio-5 + knewstuff-5 + kparts-5 + kservice-5 + kwidgetsaddons-5 + kxmlgui-5 breeze-icons ;; default icon set qca qtbase-5 @@ -1066,70 +1082,35 @@ redone.") (license ;; GPL for programs, LGPL for libraries, FDL for documentation (list license:gpl2+ license:lgpl2.0+ license:fdl1.2+)))) -(define-public print-manager - (package - (name "print-manager") - (version "23.04.3") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/release-service/" version - "/src/print-manager-" version ".tar.xz")) - (sha256 - (base32 "1fnbkx2xk3pr3cwcji1xbswcf5b7h8r4kag8i3lv28cnjw3ahs52")))) - (build-system qt-build-system) - (native-inputs - (list extra-cmake-modules)) - (inputs - (list cups - kcmutils - kconfig - kconfigwidgets - kcoreaddons - kdbusaddons - kiconthemes - ki18n - kio - knotifications - kwidgetsaddons - kwindowsystem - plasma-framework - qtdeclarative-5)) - (home-page "https://invent.kde.org/utilities/print-manager") - (synopsis "Manage print jobs and printers") - (description - "This package provides printing management for KDE.") - (license license:gpl2+))) - (define-public rsibreak (package (name "rsibreak") - (version "0.12.14") + (version "0.12.15") (source (origin (method url-fetch) (uri (string-append "mirror://kde//stable/rsibreak/0.12/" "rsibreak-" version ".tar.xz")) (sha256 - (base32 "0yjv5awngi2hk6xzlwzmj92i6qppnfc0inqdp16rd8gzfpw7xqqw")))) + (base32 "0kfbbhyzilvar3vns68pd8vkd17f07g8q9g83xxwl06zl3k6672j")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules kdoctools)) + (list extra-cmake-modules kdoctools-5)) (inputs - (list kauth - kconfig - kconfigwidgets - kcoreaddons - kcrash - kdbusaddons - ki18n - kiconthemes - kidletime - knotifications - knotifyconfig - ktextwidgets - kwindowsystem - kxmlgui + (list kauth-5 + kconfig-5 + kconfigwidgets-5 + kcoreaddons-5 + kcrash-5 + kdbusaddons-5 + ki18n-5 + kiconthemes-5 + kidletime-5 + knotifications-5 + knotifyconfig-5 + ktextwidgets-5 + kwindowsystem-5 + kxmlgui-5 breeze-icons ;; default icon set qtbase-5)) (home-page "https://apps.kde.org/rsibreak/") @@ -1144,43 +1125,43 @@ remind you to take a break now and then.") (define-public smb4k (package (name "smb4k") - (version "3.1.3") + (version "3.2.5") (source (origin (method url-fetch) (uri (string-append "https://sourceforge.net/projects/smb4k/files/" version "/smb4k-" version ".tar.xz")) (sha256 - (base32 "0prw0aq16nz9ns4d50mc6fbaw9pbcyh8p698izylhd4i0nr1dd9d")))) + (base32 "1d53yl02wrfl6wl2h4a30qiirs44qmfkfsr1kjv69fqhbqp2cszs")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules kdoctools)) + (list extra-cmake-modules kdoctools-5)) (inputs - (list kauth - kconfig - kconfigwidgets - kcompletion - kcoreaddons - kcrash - kdbusaddons - kdnssd - ki18n - kiconthemes - kio - kjobwidgets - knotifications - knotifyconfig - ktextwidgets - kwallet - kwidgetsaddons - kwindowsystem - kxmlgui + (list kauth-5 + kconfig-5 + kconfigwidgets-5 + kcompletion-5 + kcoreaddons-5 + kcrash-5 + kdbusaddons-5 + kdnssd-5 + ki18n-5 + kiconthemes-5 + kio-5 + kjobwidgets-5 + knotifications-5 + knotifyconfig-5 + ktextwidgets-5 + kwallet-5 + kwidgetsaddons-5 + kwindowsystem-5 + kxmlgui-5 samba breeze-icons ;; default icon set plasma-framework qtbase-5 qtdeclarative-5 - solid)) + solid-5)) (home-page "https://apps.kde.org/smb4k/") (synopsis "Samba (SMB) share advanced browser") (description "Smb4K is an network neighborhood browser for the KDE @@ -1216,19 +1197,21 @@ Features: (define-public sweeper (package (name "sweeper") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/sweeper-" version ".tar.xz")) (sha256 - (base32 "19b382cgdcd4qh4ppdmbhsacvcc9nlbs7spcg8ii02bdpx6qw9b7")))) + (base32 "0s1cj86p8wa9ngdqxff6mf4fx4b388b6il02g442g8q1kcqcnla5")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules kdoctools)) (inputs - (list kactivities-stats + (list breeze-icons ;; default icon set + plasma-activities-stats kbookmarks kcrash kconfig @@ -1237,9 +1220,7 @@ Features: ki18n kio ktextwidgets - kxmlgui - breeze-icons ;; default icon set - qtbase-5)) + kxmlgui)) (home-page "https://apps.kde.org/sweeper/") (synopsis "Temporary file and history cleaner") (description " diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 6d02547c4e..44b3b10606 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -11,7 +11,7 @@ ;;; Copyright © 2020 Marius Bakke <marius@gnu.org> ;;; Copyright © 2020, 2021, 2022 Michael Rohleder <mike@rohleder.de> ;;; Copyright © 2020 Prafulla Giri <pratheblackdiamond@gmail.com> -;;; Copyright © 2020, 2021, 2022, 2023 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2020, 2021, 2022, 2023, 2024 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2021 Alexandros Theodotou <alex@zrythm.org> ;;; Copyright © 2021 la snesne <lasnesne@lagunposprasihopre.org> ;;; Copyright © 2021, 2022, 2023, 2024 Vinicius Monego <monego@posteo.net> @@ -42,6 +42,7 @@ #:use-module (guix gexp) #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix utils) #:use-module (guix packages) #:use-module (gnu packages) #:use-module (gnu packages algebra) @@ -112,49 +113,75 @@ (define-public baloo-widgets (package (name "baloo-widgets") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/baloo-widgets-" version ".tar.xz")) (sha256 - (base32 "01k8kmzr2vgd567v4js080cnyl2i43zh6zz25ml76z77lywlfzz6")))) + (base32 "06238jvb44118bapgkk1yg6mn1kgmn8xx3ayfxy36bx0pl7nii5p")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) (inputs - (list baloo kconfig ki18n kio qtbase-5)) + (list baloo kconfig ki18n kio)) (arguments - `(#:tests? #f)) ;; tests fail + (list #:configure-flags #~(list "-DBUILD_WITH_QT6=ON") + #:qtbase qtbase)) (home-page "https://community.kde.org/Baloo") (synopsis "Wigets for use with Baloo") (description "Baloo is a framework for searching and managing metadata. This package contains GUI widgets for baloo.") (license license:lgpl2.0+))) +(define-public futuresql + (package + (name "futuresql") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/futuresql/futuresql-" + version ".tar.xz")) + (sha256 + (base32 "0hxxpv672jw3d14gk6dilphfcwkmbyffv0r9pakkr2v1m7axhkp4")))) + (build-system qt-build-system) + (native-inputs + (list extra-cmake-modules)) + (inputs (list qcoro-qt6)) + (arguments + (list #:qtbase qtbase + #:configure-flags #~(list "-DQT_MAJOR_VERSION=6"))) + (home-page "https://api.kde.org/futuresql/html/index.html") + (synopsis "Non-blocking Qt database framework") + (description "This package provides a non-blocking Qt database framework.") + (license license:lgpl2.1+))) + (define-public grantleetheme (package (name "grantleetheme") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/grantleetheme-" version ".tar.xz")) (sha256 - (base32 "01kkj3y6xhc792jaxnkglkwvlqx9ckn5yhlfrpqff5hlf5x9vn4w")))) + (base32 "0fsp9698wh2h53qglfg6576m309yb91s5ix4sdzckyilh31y1j2y")))) (build-system qt-build-system) - (arguments `(#:tests? #f)) ; unexpected error in the test suite. + (arguments (list + #:qtbase qtbase + #:tests? #f)) ; unexpected error in the test suite. (native-inputs (list extra-cmake-modules libxml2)) ;; xmllint required for tests (inputs - (list grantlee - kguiaddons + (list kguiaddons ki18n kiconthemes knewstuff - qtbase-5)) + kxmlgui)) + (propagated-inputs (list ktexttemplate)) (home-page "https://invent.kde.org/pim/grantleetheme") (synopsis "Library providing Grantlee theme support") (description "This library provides Grantlee theme support.") @@ -164,27 +191,28 @@ This package contains GUI widgets for baloo.") (define-public akregator (package (name "akregator") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/akregator-" version ".tar.xz")) (sha256 - (base32 "0g916453zip8i5g61pf8ib68fiqfbmr1i1lhbnwmsv1cryx035w9")))) + (base32 "07flc3617px9w1c729p0lsixf1g0h297hkbip259ykkbwxizn71q")))) (build-system qt-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'install 'wrap-qt-process-path - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin/akregator")) - (qt-process-path - (search-input-file - inputs "/lib/qt5/libexec/QtWebEngineProcess"))) - (wrap-program bin - `("QTWEBENGINEPROCESS_PATH" = (,qt-process-path))))))))) + (list #:qtbase qtbase + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'wrap-qt-process-path + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin/akregator")) + (qt-process-path + (search-input-file + inputs "/lib/qt6/libexec/QtWebEngineProcess"))) + (wrap-program bin + `("QTWEBENGINEPROCESS_PATH" = (,qt-process-path))))))))) (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -193,8 +221,7 @@ This package contains GUI widgets for baloo.") akonadi-mime boost breeze-icons - gpgme - grantlee + gpgme-1.23 grantleetheme kcmutils kcontacts @@ -209,16 +236,17 @@ This package contains GUI widgets for baloo.") kpimcommon kpimtextedit kquickcharts + kstatusnotifieritem ktextaddons ktexteditor + ktextwidgets kuserfeedback libkdepim libkleo - qgpgme - qtbase-5 - qtdeclarative-5 - qtwebchannel-5 - qtwebengine-5 + qgpgme-qt6-1.23 + qtdeclarative + qtwebchannel + qtwebengine syndication)) (home-page "https://apps.kde.org/en/akregator") (synopsis "KDE Feed Reader") @@ -234,18 +262,18 @@ browser for easy news reading.") (define-public gwenview (package (name "gwenview") - (version "23.08.5") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/gwenview-" version ".tar.xz")) (sha256 - (base32 "0f4h2vf8nkz1jcrxw98n52divvdmxh434659m1pd4l5pag0d3z54")) - (patches (search-patches "gwenview-kimageannotator.patch")))) + (base32 "0ybsra2c5dhagd8w81sccz3d9rfsj2mdnwrc4jcnkffjjk4ys09g")))) (build-system qt-build-system) (arguments - (list #:phases + (list #:qtbase qtbase + #:phases #~(modify-phases %standard-phases (replace 'check (lambda* (#:key tests? #:allow-other-keys) @@ -267,9 +295,10 @@ browser for easy news reading.") (list baloo cfitsio exiv2 - kactivities + plasma-activities kcolorpicker kguiaddons + ki18n kiconthemes kimageannotator kio @@ -281,12 +310,12 @@ browser for easy news reading.") libkdcraw libpng libtiff + libxkbcommon phonon purpose - qtimageformats-5 - qtsvg-5 - qtwayland-5 - qtx11extras + qtimageformats + qtsvg + qtwayland wayland wayland-protocols zlib)) @@ -300,7 +329,7 @@ annotating features.") (define-public kdenlive (package (name "kdenlive") - (version "24.02.2") + (version "24.05.2") (source (origin (method git-fetch) @@ -309,13 +338,14 @@ annotating features.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0chwdsk00lmhdkzac972cslfp772j2sp9ipg21jdixd1016bh8rm")))) + (base32 "1kir2drhx194jyb9zbdnk4cixdw022rl26jn1xgxr31pyklqh9in")))) (build-system qt-build-system) (arguments ;; XXX: there is a single test that spawns other tests and ;; 1/3 tests failed and 1/327 assertions failed. It seems ;; that individual tests can't be skipped. (list + #:qtbase qtbase #:configure-flags #~(list "-DBUILD_TESTING=off") #:tests? #f #:phases @@ -334,11 +364,11 @@ annotating features.") `("LADSPA_PATH" ":" = (,(string-append ladspa "/lib/ladspa"))) `("QT_QPA_PLATFORM_PLUGIN_PATH" ":" = - (,(string-append qtbase "/lib/qt5/plugins/platforms"))) + (,(string-append qtbase "/lib/qt6/plugins/platforms"))) `("MLT_PREFIX" ":" = (,#$(this-package-input "mlt")))))))))) (native-inputs - (list extra-cmake-modules kdoctools pkg-config qttools-5)) + (list extra-cmake-modules kdoctools pkg-config qttools)) (inputs (list bash-minimal breeze ; make dark them available easily @@ -359,18 +389,15 @@ annotating features.") knotifyconfig kparts kplotting + ktextwidgets ladspa mlt purpose - qtbase-5 - qtdeclarative-5 - qtgraphicaleffects - qtmultimedia-5 - qtnetworkauth-5 - qtquickcontrols-5 - qtquickcontrols2-5 - qtscript - qtsvg-5 + qtbase + qtdeclarative + qtmultimedia + qtnetworkauth + qtsvg shared-mime-info)) (home-page "https://kdenlive.org") (synopsis "Non-linear video editor") @@ -385,40 +412,40 @@ projects.") (define-public kdevelop (package (name "kdevelop") - (version "23.04.3") + (version "24.05.2") (source - (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/release-service/" version - "/src/kdevelop-" version ".tar.xz")) - (sha256 - (base32 "0m1q5nhx7wd4b8850ikw7dk6zka57gapf78wawjv2h1hijxcyf4v")))) + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/release-service/" version + "/src/kdevelop-" version ".tar.xz")) + (sha256 + (base32 "10z53ri4g3b199cv9394pflgdlcnr9y2gh7xr4isl2kpn26jiwh0")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules pkg-config shared-mime-info qttools-5)) (inputs (list boost clang grantlee - karchive - kcmutils - kcrash - kdeclarative - kdoctools - kguiaddons - ki18n - kiconthemes - kio ;; not checked as requirement - kitemmodels - kitemviews - kjobwidgets - knotifications - knotifyconfig - kparts - kservice - ksyntaxhighlighting - ktexteditor - kwindowsystem - kxmlgui + karchive-5 + kcmutils-5 + kcrash-5 + kdeclarative-5 + kdoctools-5 + kguiaddons-5 + ki18n-5 + kiconthemes-5 + kio-5 ;; not checked as requirement + kitemmodels-5 + kitemviews-5 + kjobwidgets-5 + knotifications-5 + knotifyconfig-5 + kparts-5 + kservice-5 + ksyntaxhighlighting-5 + ktexteditor-5 + kwindowsystem-5 + kxmlgui-5 libkomparediff2 breeze-icons qtbase-5 @@ -426,30 +453,29 @@ projects.") qtquickcontrols-5 ;; not checked as requirement qtquickcontrols2-5 ;; not checked as requirement qtwebengine-5 - threadweaver + threadweaver-5 ;; recommendes astyle kdevelop-pg-qt - libksysguard ;; optional apr ; required for subversion support apr-util ; required for subversion support - attica - kconfigwidgets - knewstuff - krunner + attica-5 + kconfigwidgets-5 + knewstuff-5 + krunner-5 ;; TODO: OktetaGui, OktetaKastenControllers plasma-framework ;; TODO: purpose - sonnet + sonnet-5 subversion)) - ;; run-time packages - TODO - ;; ClazyStandalone - ;; Cppcheck - ;; heaptrack - ;; heaptrack_gui - ;; meson + ;; run-time packages - TODO + ;; ClazyStandalone + ;; Cppcheck + ;; heaptrack + ;; heaptrack_gui + ;; meson (arguments (list #:tests? #f ;; there are some issues with the test suite #:phases @@ -497,21 +523,22 @@ for some KDevelop language plugins (Ruby, PHP, CSS...).") (define-public kdiagram (package (name "kdiagram") - (version "2.8.0") + (version "3.0.1") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/kdiagram/" version "/kdiagram-" version ".tar.xz")) (sha256 - (base32 "07s3kwv0mqvb64x8nz4w1yb3hbk28yzkw4qg1jibai7as4xsv7ap")) + (base32 "0vcw339v6nl1haznp58spimanfhw143cindbym1q3ccxrp1b0na6")) (patches (search-patches "kdiagram-Fix-missing-link-libraries.patch")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules qttools-5)) + (list extra-cmake-modules qttools)) (inputs - (list qtbase-5 qtsvg-5)) + (list qtsvg)) + (arguments (list #:qtbase qtbase)) (home-page "https://invent.kde.org/graphics/kdiagram") (synopsis "Libraries for creating business diagrams") (description "This package provides libraries for integrating business @@ -523,10 +550,36 @@ a module for implementing ODF Gantt charts, which are bar charts that illustrate project schedules.") (license license:gpl2+))) +(define-public kdsoap-ws-discovery-client + (package + (name "kdsoap-ws-discovery-client") + (version "0.4.0") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/kdsoap-ws-discovery-client/" + "/kdsoap-ws-discovery-client-" version ".tar.xz")) + (sha256 + (base32 "0yj2ngw4li5r6zhmkh2lb8fdf8ixz6pp5hxsb4342pz72g04glic")))) + (build-system qt-build-system) + (native-inputs + (list extra-cmake-modules)) + (inputs (list kdsoap-qt6)) + (arguments (list + ;; test require network. + #:tests? #f + #:configure-flags #~(list "-DQT_MAJOR_VERSION=6") + #:qtbase qtbase)) + (home-page "https://caspermeijn.gitlab.io/kdsoap-ws-discovery-client/") + (synopsis "WS-Discovery client library based on KDSoap") + (description "This package provides a ws-Discovery client library based on +KDSoap.") + (license license:gpl3+))) + (define-public kio-extras (package (name "kio-extras") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" @@ -534,7 +587,7 @@ illustrate project schedules.") version ".tar.xz")) (sha256 (base32 - "1ygxfq62idpgf1dlic1245y5gf0fnkrpbqxd230xmxi7a35za8qd")))) + "0h720wcgsdx9h5vlr4flxrd3djmhwvlwkrf0yzwsf4amcb9wds8r")))) (build-system cmake-build-system) (arguments (list #:phases #~(modify-phases %standard-phases @@ -544,21 +597,24 @@ illustrate project schedules.") (setenv "HOME" (getcwd)) (setenv "TMPDIR" (getcwd)) (invoke "ctest" "-E" "(thumbnailtest|testkioarchive)"))))))) - (native-inputs (list extra-cmake-modules dbus kdoctools pkg-config qttools-5)) - ;; TODO: libappimage, kdsoap-ws-discovery-client + (native-inputs (list extra-cmake-modules dbus kdoctools pkg-config qttools)) + ;; TODO: libappimage (inputs (list gperf imath - kactivities - kactivities-stats + plasma-activities + plasma-activities-stats karchive kbookmarks + kcmutils kconfig kconfigwidgets kcoreaddons kdnssd kdbusaddons - kdsoap + kdsoap-qt6 + kdsoap-ws-discovery-client kguiaddons + ktextwidgets ki18n kio ksyntaxhighlighting @@ -570,8 +626,10 @@ illustrate project schedules.") libtirpc openexr phonon - qtbase-5 - qtsvg-5 + qtbase + qt5compat + qcoro-qt6 + qtsvg samba shared-mime-info solid @@ -587,27 +645,29 @@ the functionality of the KDE resource and network access abstractions.") (define-public kio-fuse (package (name "kio-fuse") - (version "5.0.1") + (version "5.1.0") (source (origin (method url-fetch) - (uri (string-append "mirror://kde/stable/" name "/" version "/" - name "-" version ".tar.xz")) + (uri (string-append "mirror://kde/stable/kio-fuse/kio-fuse-" + version ".tar.xz")) (sha256 (base32 - "1pb62h45c06dq3rml91xbf8j5y2c1l8z8j8lycchxrlgys5rlrv6")))) + "0jz9952dd20sw0c25pyn2l86nmc1s5l42gxk4js1jnkx4a0la43x")))) (build-system cmake-build-system) (arguments - (list #:phases #~(modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (setenv "HOME" (getcwd)) - (setenv "XDG_RUNTIME_DIR" (getcwd)) - (setenv "QT_QPA_PLATFORM" "offscreen") - (invoke "dbus-launch" "ctest" "-E" - "(fileopstest-cache|fileopstest-filejob)"))))))) + (list + #:configure-flags #~(list "-DQT_MAJOR_VERSION=6") + #:phases #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "HOME" (getcwd)) + (setenv "XDG_RUNTIME_DIR" (getcwd)) + (setenv "QT_QPA_PLATFORM" "offscreen") + (invoke "dbus-launch" "ctest" "-E" + "(fileopstest-cache|fileopstest-filejob)"))))))) (native-inputs (list dbus extra-cmake-modules pkg-config)) - (inputs (list fuse kio kcoreaddons qtbase-5)) + (inputs (list fuse kio kcoreaddons qtbase)) (home-page "https://community.kde.org/Frameworks") (synopsis "FUSE Interface for KIO") (description "This package provides FUSE Interface for KIO.") @@ -616,7 +676,7 @@ the functionality of the KDE resource and network access abstractions.") (define-public kirigami-addons (package (name "kirigami-addons") - (version "0.10.0") + (version "1.3.0") (source (origin (method git-fetch) (uri (git-reference @@ -625,12 +685,14 @@ the functionality of the KDE resource and network access abstractions.") (file-name (git-file-name name version)) (sha256 (base32 - "154yzhy6nva4d39lnsh7i40vvrj146263j07kfkd1g1w4qy381y3")))) + "1nsp4vihjhv985nlr6h86jvk43v3x9njla7l03jpcz6g95jdrnmp")))) (build-system qt-build-system) (arguments - (list #:tests? #f)) ; failing test + (list + #:qtbase qtbase + #:tests? #f)) ; failing test (native-inputs (list extra-cmake-modules)) - (inputs (list kirigami ki18n qtdeclarative-5 qtquickcontrols2-5)) + (inputs (list kirigami ki18n kconfig qtdeclarative)) (home-page "https://invent.kde.org/libraries/kirigami-addons") (synopsis "Add-ons for the Kirigami framework") (description @@ -667,7 +729,7 @@ expression library, that is used in Krita.") (define-public kcolorchooser (package (name "kcolorchooser") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) @@ -675,7 +737,7 @@ expression library, that is used in Krita.") "/src/kcolorchooser-" version ".tar.xz")) (sha256 (base32 - "1ripvn2li74rwngicay9c78j0slia1rpsi1f43rbb36p9af02lwq")))) + "1qfp2kf98kf5qps11q7mi6y8z6bfd4bxwvx6ijv4p1jw0cmylj11")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) @@ -683,6 +745,7 @@ expression library, that is used in Krita.") (list kcoreaddons ki18n kxmlgui)) + (arguments (list #:qtbase qtbase)) (home-page "https://apps.kde.org/de/kcolorchooser/") (synopsis "Color selector utility") (description "KColorChooser is a utility to select a color.") @@ -691,14 +754,14 @@ expression library, that is used in Krita.") (define-public kolourpaint (package (name "kolourpaint") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kolourpaint-" version ".tar.xz")) (sha256 - (base32 "1ab9v6ksb185f6jfhhk578qazhmy8hx6s8vjr9xyh7k3jilayj9v")))) + (base32 "1fi1y74s2lnrxdnr9ym4b1ilj9qi019gaavfv0sq1xg8ppbpgcbr")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules kdoctools)) @@ -710,6 +773,7 @@ expression library, that is used in Krita.") ktextwidgets kwidgetsaddons kxmlgui)) + (arguments (list #:qtbase qtbase)) (home-page "http://kolourpaint.org/") (synopsis "Paint program for KDE") (description "KolourPaint is a paint program for KDE. It is useful for @@ -719,7 +783,7 @@ painting, image manipulating and icon editing.") (define-public krita (package (name "krita") - (version "5.2.1") + (version "5.2.3") (source (origin (method url-fetch) @@ -727,7 +791,7 @@ painting, image manipulating and icon editing.") "mirror://kde/stable/krita/" version "/krita-" version ".tar.gz")) (sha256 - (base32 "1kzmn89b1vrasba7z8hp8izyrrskgc7ggnz82zqyyy1v5d8mnri7")) + (base32 "1h2whbccgr2xhln4zx708hksg4284dhgjz10cnnkfgiwp7nlcsj6")) (patches (search-patches "krita-bump-sip-abi-version-to-12.8.patch")))) (build-system qt-build-system) (arguments @@ -749,7 +813,13 @@ painting, image manipulating and icon editing.") (("set\\(CMAKE_AUTOMOC OFF\\)") "set(CMAKE_AUTOMOC OFF) set(CMAKE_CXX_FLAGS \"${CMAKE_CXX_FLAGS} -fPIC\" ) -set(CMAKE_C_FLAGS \"${CMAKE_C_FLAGS} -fPIC\" ) "))))))) +set(CMAKE_C_FLAGS \"${CMAKE_C_FLAGS} -fPIC\" ) ")))) + (add-after 'install 'wrap-bin + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (python-path (getenv "GUIX_PYTHONPATH"))) + (wrap-program (string-append out "/bin/krita") + `("GUIX_PYTHONPATH" ":" prefix (,python-path))))))))) (native-inputs (list curl eigen @@ -775,26 +845,26 @@ set(CMAKE_C_FLAGS \"${CMAKE_C_FLAGS} -fPIC\" ) "))))))) harfbuzz imath immer - karchive - kcompletion - kconfig - kcoreaddons - kcrash - kguiaddons - ki18n - kiconthemes - kio - kitemviews + karchive-5 + kcompletion-5 + kconfig-5 + kcoreaddons-5 + kcrash-5 + kguiaddons-5 + ki18n-5 + kiconthemes-5 + kio-5 + kitemviews-5 kseexpr - kwidgetsaddons - kwindowsystem - kxmlgui + kwidgetsaddons-5 + kwindowsystem-5 + kxmlgui-5 lager lcms libheif libjpeg-turbo libjxl - libkdcraw + libkdcraw-qt5 libmypaint libpng ;; libraqm @@ -837,7 +907,7 @@ features include brush stabilizers, brush engines and wrap-around mode.") (define-public massif-visualizer (package (name "massif-visualizer") - (version "0.7.0") + (version "0.8.0") (source (origin (method url-fetch) @@ -845,8 +915,8 @@ features include brush stabilizers, brush engines and wrap-around mode.") "mirror://kde/stable/massif-visualizer/" version "/src/massif-visualizer-" version ".tar.xz")) (sha256 - (base32 "0v8z6r9gngzckvqyxjm9kp7hilwfqibyk2f9vag9l98ar0iwr97q")))) - (build-system cmake-build-system) + (base32 "104ab36c4djdb7fndpg0gvak3wlr5i7cni5prz46pfwz1l73zbaz")))) + (build-system qt-build-system) (native-inputs (list extra-cmake-modules pkg-config shared-mime-info)) (inputs @@ -857,9 +927,9 @@ features include brush stabilizers, brush engines and wrap-around mode.") kgraphviewer kio ki18n - qtbase-5 - qtsvg-5 - qtxmlpatterns)) + qtsvg + qt5compat)) + (arguments (list #:qtbase qtbase)) (home-page "https://apps.kde.org/massif-visualizer/") (synopsis "Visualize massif data generated by Valgrind") (description @@ -872,7 +942,7 @@ compressed massif files can also be opened transparently.") (define-public libqaccessibilityclient (package (name "libqaccessibilityclient") - (version "0.4.1") + (version "0.6.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/" name @@ -880,50 +950,61 @@ compressed massif files can also be opened transparently.") ".tar.xz")) (sha256 (base32 - "0a9lv2jb5gyqxvrkl5xl09gjnlp05b5yfzfb0wmaxz0l8d7qnxhw")))) + "0csxbwy4479196l32j4xnk672kiyggcaf3fi3q2cbj9dc94c8l2c")))) (build-system cmake-build-system) (arguments - `(#:tests? #f ;TODO: Failing tests - #:phases (modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - ; - ;; make Qt render "offscreen", required for tests - (setenv "QT_QPA_PLATFORM" "offscreen") - ;; For missing '/etc/machine-id' - (setenv "DBUS_FATAL_WARNINGS" "0") - (setenv "HOME" - (getcwd)) - (invoke "dbus-launch" "ctest"))))))) + (list #:tests? #f ;TODO: Failing tests + #:configure-flags + #~(list (string-append + "-DQT_MAJOR_VERSION=" + #$(version-major + (package-version (this-package-input "qtbase"))))) + #:phases #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + ;; make Qt render "offscreen", required for tests + (setenv "QT_QPA_PLATFORM" "offscreen") + ;; For missing '/etc/machine-id' + (setenv "DBUS_FATAL_WARNINGS" "0") + (setenv "HOME" + (getcwd)) + (invoke "dbus-launch" "ctest"))))))) (native-inputs (list dbus extra-cmake-modules)) - (inputs (list qtbase-5)) + (inputs (list qtbase)) (home-page "https://invent.kde.org/libraries/libqaccessibilityclient") (synopsis "Helper library to make writing accessibility tools easier") (description "This package provides library that is used when writing accessibility clients such as screen readers.") (license license:lgpl2.1+))) +(define-public libqaccessibilityclient-qt5 + (package + (inherit libqaccessibilityclient) + (name "libqaccessibilityclient-qt5") + (inputs (modify-inputs (package-inputs libqaccessibilityclient) + (replace "qtbase" qtbase-5))))) + (define-public libkomparediff2 (package (name "libkomparediff2") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/libkomparediff2-" version ".tar.xz")) (sha256 - (base32 "1zkiyyrbfbr1i7zyhhayf53daaarzc8a2xz0iqjy9za7rawnmgbv")))) + (base32 "1g4zjsdd49n2kh5m8ijm9cm95wfn2rglgnmvvr0ap1iidy4843hy")))) (native-inputs (list extra-cmake-modules pkg-config)) (inputs - (list kcodecs - kconfig - kcoreaddons - ki18n - kio - kxmlgui + (list kcodecs-5 + kconfig-5 + kcoreaddons-5 + ki18n-5 + kio-5 + kxmlgui-5 qtbase-5)) (build-system cmake-build-system) (home-page "https://kde.org") @@ -938,14 +1019,14 @@ used in KDE development tools Kompare and KDevelop.") (define-public qca (package (name "qca") - (version "2.3.7") + (version "2.3.9") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/qca/" version "/qca-" version ".tar.xz")) (sha256 - (base32 "0hrzmzvzsgzn4nvplgg2wmxaql7fjvi3rcqgwgimnzb8ahxk9qpy")))) + (base32 "0kkf8wyc7slii86danfl4cx59yhcyc363ydiwapnnyyxihlxamf5")))) (build-system cmake-build-system) (native-inputs (list pkg-config)) @@ -959,10 +1040,18 @@ including SSL/TLS, X.509 certificates, SASL, OpenPGP, S/MIME CMS, and smart cards.") (license license:lgpl2.1+))) +(define-public qca-qt6 + (package + (inherit qca) + (name "qca-qt6") + (arguments (list #:configure-flags #~(list "-DBUILD_WITH_QT6=ON"))) + (inputs + (list openssl qtbase qt5compat)))) + (define-public kommit (package (name "kommit") - (version "1.0.2") + (version "1.6.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/" @@ -970,7 +1059,7 @@ cards.") version ".tar.xz")) (sha256 (base32 - "0vp9d1x01na28p6smbd6spx14bjnzilr2bjsd380h1d17b9cm3hy")))) + "09ahnizl5mqdrg583lxkwwnsq8ci95fk49wx9733ah4c39gync5c")))) (build-system qt-build-system) (arguments (list #:phases @@ -978,21 +1067,25 @@ cards.") (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? + ;; FIXME: many test is fail, but look likes it can works. (invoke "ctest" "-E" - "(difftest|clonedialogtest|overlaytest)"))))))) + "(difftest|clonedialogtest|tagtest|indextest|\ +branchestest|configtest|stashtest|filetest|overlaytest|remotetest|clonetest|\ +submoduletest)"))))))) (native-inputs - (list extra-cmake-modules kdoctools)) + (list extra-cmake-modules kdoctools-5 pkg-config)) (inputs - (list kconfigwidgets - kcoreaddons - kcrash - kdbusaddons - ki18n - kxmlgui - kio - ktextwidgets - ktexteditor - ksyntaxhighlighting)) + (list kconfigwidgets-5 + kcoreaddons-5 + kcrash-5 + kdbusaddons-5 + ki18n-5 + kxmlgui-5 + kio-5 + ktextwidgets-5 + ktexteditor-5 + ksyntaxhighlighting-5 + libgit2-1.8)) (home-page "https://apps.kde.org/kommit/") (synopsis "Git client for KDE") (description @@ -1002,27 +1095,27 @@ cards.") (define-public kompare (package (name "kompare") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kompare-" version ".tar.xz")) (sha256 (base32 - "058rr0n5r9czxqs6ixacx0bm8hglwjmhfpf5xf1zr0fjgcirlrwy")))) + "13kvxa3l5hp9fi6ijy8vyzzm4ackrf09k6rm0nicb5z1s3iyyvxh")))) (build-system qt-build-system) (native-inputs - (list extra-cmake-modules kdoctools)) + (list extra-cmake-modules kdoctools-5)) (inputs (list libkomparediff2 - kcodecs - kconfig - kcoreaddons - kiconthemes - kjobwidgets - kparts - ktexteditor - kwidgetsaddons)) + kcodecs-5 + kconfig-5 + kcoreaddons-5 + kiconthemes-5 + kjobwidgets-5 + kparts-5 + ktexteditor-5 + kwidgetsaddons-5)) (home-page "https://apps.kde.org/kompare/") (synopsis "Graphical file differences tool") (description @@ -1046,30 +1139,32 @@ include: (define-public kopeninghours (package (name "kopeninghours") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/" name "-" version ".tar.xz")) (sha256 (base32 - "14m4wl79b4qad42l1capz59pslfcrm25jshyhmcqzhqb0wzwkav9")))) + "132ihgsv1l8nz24ycddfp146czhnfcgrjfnffjb91w5l4a5wv3k4")))) (build-system cmake-build-system) (arguments - (list #:phases #~(modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (setenv "QT_QPA_PLATFORM" "offscreen") - (invoke "ctest" "-E" - "(evaluatetest|iterationtest)"))))))) + (list + #:configure-flags #~(list "-DBUILD_WITH_QT6=ON") + #:phases #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "QT_QPA_PLATFORM" "offscreen") + (invoke "ctest" "-E" + "(evaluatetest|iterationtest)"))))))) (native-inputs (list bison extra-cmake-modules flex)) (inputs (list boost kholidays ki18n osmctools - qtbase-5 - qtdeclarative-5)) + qtbase + qtdeclarative)) (home-page "https://invent.kde.org/libraries/kopeninghours") (synopsis "Get opening hours from OpenStreetMap") (description @@ -1080,21 +1175,21 @@ opening hours expressions.") (define-public kosmindoormap (package (name "kosmindoormap") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/" name "-" version ".tar.xz")) (sha256 (base32 - "1winrgc3698wjpil0hblw7bgbgaxgjh6h3dsl1kwc77w14f6vql3")))) + "1inch8vnh96lbklrj9w6d7vyqnbaig8f0kgfr5k7i5983vqpsvlm")))) (build-system cmake-build-system) - (native-inputs (list bison extra-cmake-modules flex)) + (native-inputs (list bison extra-cmake-modules flex python-minimal)) (inputs (list ki18n kopeninghours kpublictransport - qtbase-5 - qtdeclarative-5 + qtbase + qtdeclarative zlib)) (home-page "https://invent.kde.org/libraries/kosmindoormap") (synopsis "Indoor map renderer") @@ -1106,7 +1201,7 @@ multi-floor indoor maps.") (define-public kpmcore (package (name "kpmcore") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append @@ -1114,7 +1209,7 @@ multi-floor indoor maps.") "/src/" name "-" version ".tar.xz")) (sha256 (base32 - "0cz0pz84sxa7lvkq8v25775z7x7g6pz9sq7c90pfv8h9qsz8q1l9")))) + "1nrmfxs8hbba8b3ml4g9qaf0klzcm8ar052npv5lm0whx6zld1lf")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules pkg-config)) @@ -1123,9 +1218,9 @@ multi-floor indoor maps.") kcoreaddons ki18n kwidgetsaddons - polkit-qt - qtbase-5 - qca + polkit-qt6 + qtbase + qca-qt6 `(,util-linux "lib"))) (arguments (list @@ -1144,7 +1239,7 @@ multi-floor indoor maps.") (define-public kpublictransport (package (name "kpublictransport") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" @@ -1152,10 +1247,11 @@ multi-floor indoor maps.") ".tar.xz")) (sha256 (base32 - "04fa9ismgkhskpmjf6b8gvra2z0jpsigz79b93m1snxm4046xihb")))) + "1g78kmnqg9y4mvd7nmlb4nd02ch3p5gxhnbphcnisc3ym3w3q1jj")))) (build-system qt-build-system) (arguments - (list #:phases #~(modify-phases %standard-phases + (list #:qtbase qtbase + #:phases #~(modify-phases %standard-phases (add-before 'check 'check-setup (lambda* (#:key inputs #:allow-other-keys) (setenv "QT_QPA_PLATFORM" "offscreen") @@ -1169,7 +1265,7 @@ multi-floor indoor maps.") (inputs (list clipper osmctools protobuf - qtdeclarative-5 + qtdeclarative zlib networkmanager-qt ki18n)) @@ -1209,7 +1305,7 @@ different notification systems.") (define-public kdeconnect (package (name "kdeconnect") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) @@ -1218,13 +1314,18 @@ different notification systems.") version ".tar.xz")) (sha256 (base32 - "1gcmqqj752h3lmcpvc7cm6k6bpb158ha7i5ysp0kqvf8cmpi5ydz")))) + "0jh5rx6amg7mxgy0n0hv23wj3qqmb37212996ssm41bvxnmjgn03")))) (build-system qt-build-system) (arguments - (list #:configure-flags #~'("-DBUILD_TESTING=ON" - "-DKDE_INSTALL_LIBEXECDIR=libexec" - ;; So kdeconnect.so isn't installed to lib/plugins - "-DPLUGIN_INSTALL_DIR=lib/qt5/plugins") + (list #:qtbase qtbase + #:configure-flags + #~(list "-DBUILD_TESTING=ON" + (string-append "-DQtWaylandScanner_EXECUTABLE=" + #$(this-package-native-input "qtwayland") + "/lib/qt6/libexec/qtwaylandscanner") + "-DKDE_INSTALL_LIBEXECDIR=libexec" + ;; So kdeconnect.so isn't installed to lib/plugins + "-DPLUGIN_INSTALL_DIR=lib/qt6/plugins") #:tests? #f)) ; tests fail hard in our build environment (native-inputs (list extra-cmake-modules @@ -1232,9 +1333,11 @@ different notification systems.") libxtst pkg-config python-wrapper - wayland-protocols)) + wayland-protocols + qtwayland)) (inputs - (list kcmutils + (list dbus + kcmutils kconfigwidgets kdbusaddons kguiaddons @@ -1242,24 +1345,22 @@ different notification systems.") kiconthemes kio kirigami + kirigami-addons knotifications kpackage kpeople - kpeoplevcard + kstatusnotifieritem kwayland libfakekey + openssl plasma-wayland-protocols pulseaudio-qt - qca + qca-qt6 qqc2-desktop-style - qtbase-5 - qtdeclarative-5 - qtgraphicaleffects - qtmultimedia-5 - qtquickcontrols-5 - qtquickcontrols2-5 - qtx11extras - qtwayland-5 + qtbase + qtdeclarative + qtmultimedia + qtwayland wayland modemmanager-qt libxkbcommon)) @@ -1315,27 +1416,26 @@ communicate with each other. Here's a few things KDE Connect can do: python-wrapper qttools-5)) (inputs - (list breeze ;for dark themes + (list breeze-qt5 ;for dark themes breeze-icons ;for icons gsl - karchive - kcompletion - kconfig - kconfigwidgets - kcoreaddons - kcrash - kdoctools - ki18n - kiconthemes - kio - knewstuff - kparts - kservice - ksyntaxhighlighting - ktextwidgets - kuserfeedback - kwidgetsaddons - kxmlgui + karchive-5 + kcompletion-5 + kconfig-5 + kconfigwidgets-5 + kcoreaddons-5 + kcrash-5 + kdoctools-5 + ki18n-5 + kiconthemes-5 + kio-5 + knewstuff-5 + kparts-5 + kservice-5 + ksyntaxhighlighting-5 + ktextwidgets-5 + kwidgetsaddons-5 + kxmlgui-5 qtbase-5 qtsvg-5 shared-mime-info @@ -1359,14 +1459,14 @@ to perform data analysis.") (define-public kdf (package (name "kdf") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kdf-" version ".tar.xz")) (sha256 (base32 - "11ndcbfkq5fhb1lfij0mmm43fw49sh0z3nw644sll0smcwic76aa")))) + "1gp0r0dj58zq5rflw7yb42znjwvbq3aa0xqz5dfbxf7m3widri6g")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules kdoctools)) @@ -1379,27 +1479,29 @@ to perform data analysis.") kio knotifications kwidgetsaddons + kstatusnotifieritem kxmlgui - qtbase-5)) + qt5compat)) + (arguments (list #:qtbase qtbase)) (home-page "https://kde.org/applications/system/kdk") (synopsis "View Disk Usage") (description "KDiskFree displays the available file devices (hard drive partitions, floppy and CD drives, etc.) along with information on their capacity, free space, type and mount point. It also allows you to mount and unmount drives and view them in a file manager.") -(license license:gpl2+))) + (license license:gpl2+))) (define-public ktimer (package (name "ktimer") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/ktimer-" version ".tar.xz")) (sha256 (base32 - "1n5az5cgb0q28lz5f7afqjlfga32q232g836nkl1sfq8n5whj5z5")))) + "1s3fwxxdpc4qsxby01sdp5c2sdzb1a9y37d172gvk41148swl5np")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules @@ -1408,7 +1510,11 @@ unmount drives and view them in a file manager.") (list kdbusaddons ki18n kio - knotifications)) + knotifications + kconfigwidgets + kstatusnotifieritem + qt5compat)) + (arguments (list #:qtbase qtbase)) (home-page "https://kde.org/applications/utilities/ktimer") (synopsis "Countdown Launcher") (description "KTimer is a little tool to execute programs after some time. @@ -1419,19 +1525,19 @@ timers for each task can be started, stopped, changed, or looped.") (define-public kcachegrind (package (name "kcachegrind") - (version "23.08.4") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/kcachegrind-" version ".tar.xz")) (sha256 (base32 - "011bsb9yxrjmazqs1s6fvzvga4mlhjpdvkifbxblqavwp3ipmwbw")))) + "1j0i8sigf21b3w4r0cahrdm046pcinsldqhcms2bhv14v9lirc19")))) (build-system cmake-build-system) (native-inputs - (list extra-cmake-modules perl python qttools-5 kdoctools)) + (list extra-cmake-modules perl python qttools kdoctools)) (inputs - (list qtbase-5 karchive ki18n kio kdbusaddons)) + (list qtbase karchive ki18n kio kxmlgui kdbusaddons)) ;; Note: The 'hotshot2calltree' and 'pprof2calltree' scripts depend on ;; Python and PHP, respectively. These are optional and we ignore them ;; for now. @@ -1453,15 +1559,16 @@ Python, PHP, and Perl.") (define-public libkdegames (package (name "libkdegames") - (version "23.04.3") + (version "24.05.2") (source (origin - (method url-fetch) - (uri (string-append "mirror://kde/stable/release-service/" version - "/src/libkdegames-" version ".tar.xz")) - (sha256 - (base32 "1sicpfsrkxn5d0fdy71h7033rpkb94r5hjvv5ab7qbmzb1qa4awq")))) + (method url-fetch) + (uri (string-append "mirror://kde/stable/release-service/" version + "/src/libkdegames-" version ".tar.xz")) + (sha256 + (base32 "1sqhlhanb5vfbxp6g01rkgaj5v9gi1cxfgsmw39s0cikjfvidwpa")))) (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules)) (inputs @@ -1478,7 +1585,6 @@ Python, PHP, and Perl.") kguiaddons ki18n kiconthemes - ;("kio" ,kio) kitemviews kjobwidgets knewstuff @@ -1488,9 +1594,8 @@ Python, PHP, and Perl.") kxmlgui libsndfile openal - qtbase-5 - qtdeclarative-5 - qtsvg-5)) + qtdeclarative + qtsvg)) (home-page "https://apps.kde.org/categories/games/") (synopsis "Runtime library for kdegames") (description "Runtime library for kdegames") @@ -1499,7 +1604,7 @@ Python, PHP, and Perl.") (define-public marble-qt (package (name "marble-qt") - (version "23.04.3") + (version "24.05.2") (source (origin (method git-fetch) @@ -1509,7 +1614,7 @@ Python, PHP, and Perl.") (file-name (git-file-name name version)) (sha256 (base32 - "02qv2mfga4jm5br9dr8g6kcqr93q2ssq06m383kh83lkvickxzc9")))) + "126zm2r637zd8xg0mrqh3g0phlph440ayyzrx8hfvb03drx6y70z")))) (build-system qt-build-system) (arguments ;; FIXME: libmarblewidget-qt5.so.28 not found. Also enable the @@ -1520,24 +1625,25 @@ Python, PHP, and Perl.") "-DBUILD_TOUCH=YES" "-DBUILD_MARBLE_TESTS=FALSE"))) (native-inputs - (list extra-cmake-modules kdoctools qttools-5)) + (list extra-cmake-modules kdoctools-5 qttools-5 + osmctools)) ;; One optional dependency missing: libwlocate. (inputs (list gpsd - kcoreaddons - kcrash - ki18n - kio - knewstuff - kparts - krunner - kwallet + kcoreaddons-5 + kcrash-5 + ki18n-5 + kio-5 + knewstuff-5 + kparts-5 + krunner-5 + kwallet-5 perl phonon protobuf qtbase-5 qtdeclarative-5 - qtlocation + qtlocation-5 qtserialport qtsvg-5 qtwebchannel-5 @@ -1556,17 +1662,18 @@ creating routes by drag and drop and more.") (define-public okular (package (name "okular") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/" name "-" version ".tar.xz")) (sha256 - (base32 "1vgcqkq6mzd270hzabmdqqv105iv6kr6ah2h18b15al2n9rmg0bi")))) + (base32 "0kh3a40887f7lajgvk3ndr3ns3mm1kld0biw0cqg9ys69f4d8677")))) (build-system qt-build-system) (arguments (list + #:qtbase qtbase #:phases #~(modify-phases %standard-phases (delete 'check) @@ -1578,7 +1685,8 @@ creating routes by drag and drop and more.") "--output-on-failure" "--rerun-failed" "-E" - "(mainshelltest|parttest|chmgeneratortest)")))) + "(annotationtoolbartest|mainshelltest|parttest|\ +chmgeneratortest)")))) (add-before 'check 'check-setup (lambda* (#:key outputs #:allow-other-keys) (let ((share (string-append (assoc-ref outputs "out") "/share"))) @@ -1597,40 +1705,39 @@ creating routes by drag and drop and more.") breeze-icons discount djvulibre - kactivities - khtml + plasma-activities chmlib kdegraphics-mobipocket karchive kbookmarks kcompletion kconfig - qtbase-5 libjpeg-turbo libtiff kirigami purpose freetype + ki18n kiconthemes kio kparts kpty - qtspeech-5 + ktextwidgets + qtspeech kwallet kwindowsystem libkexiv2 libspectre libzip + libxkbcommon phonon - poppler-qt5 + poppler-qt6 qca - qtdeclarative-5 - qtsvg-5 - qtwayland-5 + qtdeclarative + qtsvg + qtwayland threadweaver - kcrash - kjs - qtx11extras)) + kcrash)) (home-page "https://apps.kde.org/okular/") (synopsis "Document viewer") (description @@ -1641,7 +1748,7 @@ a variety of formats, including PDF, PostScript, DejaVu, and EPub.") (define-public poxml (package (name "poxml") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri @@ -1649,10 +1756,10 @@ a variety of formats, including PDF, PostScript, DejaVu, and EPub.") "/src/poxml-" version ".tar.xz")) (sha256 (base32 - "11rqd7hhsy6f8qi0529cmy381bhskji6wf4fij7yjksmrsdvfw6d")))) + "0998ss7jib255x9kyhsz79lgnf97m7hbm6dsyh6xj9rcwv8i9srk")))) (build-system cmake-build-system) (native-inputs - (list extra-cmake-modules kdoctools)) + (list extra-cmake-modules kdoctools-5)) (inputs (list gettext-minimal qtbase-5)) (home-page "https://apps.kde.org/development/") @@ -1666,19 +1773,20 @@ PO template files.") (define-public kdegraphics-mobipocket (package (name "kdegraphics-mobipocket") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/" name "-" version ".tar.xz")) (sha256 - (base32 "13hn6dh5d4vsblvg6wyyvbmcyl0yyqr8srilik86wilp58qbsrdv")))) + (base32 "1hcglnbw2ck864glgd4aag54826aycmncmizfqlpncfzwdayq204")))) (build-system cmake-build-system) + (arguments (list #:configure-flags #~(list "-DQT_MAJOR_VERSION=6"))) (native-inputs (list extra-cmake-modules)) (inputs - (list kio qtbase-5)) + (list kio qtbase qt5compat)) (home-page "https://apps.kde.org/en/kdegraphics_mobipocket") (synopsis "KDE thumbnailer for Mobipocket files") (description "This package provides a KDE plugin that shows thumbnails of @@ -1688,41 +1796,45 @@ Mobipocket e-books in Dolphin and other KDE apps.") (define-public libkexiv2 (package (name "libkexiv2") - (version "23.04.3") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version "/src/" name "-" version ".tar.xz")) (sha256 - (base32 "16cb7cab4pyarwwn2byyvanwlakcgq5h203hkysp44flszq515cl")))) + (base32 "04z36kvj9nwr9i8xs6hi0lqmxz7lqyhs9c1cngcb7p7lw9hmynch")))) (build-system cmake-build-system) + (arguments (list #:configure-flags #~(list "-DQT_MAJOR_VERSION=6"))) (native-inputs (list extra-cmake-modules)) (inputs - (list exiv2 qtbase-5)) + (list exiv2 qtbase)) (home-page "https://invent.kde.org/graphics/libkexiv2") (synopsis "Manipulate the metadata of images") (description "Libkexiv2 wraps the Exiv2 library, allowing to manipulate picture metadata as EXIF/IPTC and XMP.") (license license:gpl2+))) -(define-public zeroconf-ioslave +(define-public kio-zeroconf (package - (name "zeroconf-ioslave") - (version "22.04.3") + (name "kio-zeroconf") + (version "24.05.2") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/release-service/" version - "/src/zeroconf-ioslave-" version ".tar.xz")) + "/src/kio-zeroconf-" version ".tar.xz")) (sha256 - (base32 "0jbrdbphxn77dg2a4wzsm7q24455j4d1xhd4rj5iwhq4ywiig9i1")))) + (base32 "058w37n7s8lbc8mjqjpqarhg8b2796x2yssrxnppib12dld9x4wb")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) (inputs - (list kdbusaddons kdnssd ki18n kio qtbase-5)) + (list kdbusaddons kdnssd ki18n kio)) + (arguments (list #:qtbase qtbase + #:configure-flags + #~(list "-DQT_MAJOR_VERSION=6"))) (home-page "https://apps.kde.org/kio_zeroconf/") (synopsis "DNS-SD Service Discovery Monitor") (description "Adds an entry to Dolphin's Network page to show local @@ -1737,18 +1849,18 @@ or Bonjour by other projects).") ;; FIXME: Check https://www.reddit.com/r/kde/comments/f7ojg9 for insights (package (name "kuserfeedback") - (version "1.2.0") + (version "1.3.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/kuserfeedback/" "/kuserfeedback-" version ".tar.xz")) (sha256 - (base32 "0r7jcc88n5b4rc0asjzh7m7g33i35k3z99l08qkrn92kn4ickakn")))) + (base32 "04zx5wfzqyargbvkbd66iabi4mfsn34qh5mbhpm90inx4aw0h8r5")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules - qttools-5 + qttools ;; For optional component "Survey target expression parser" bison flex @@ -1757,9 +1869,12 @@ or Bonjour by other projects).") ;;("phpunit" ,phpunit) )) (inputs - (list qtbase-5 qtcharts qtdeclarative-5 qtsvg-5)) + (list qtdeclarative qtsvg)) (arguments - `(#:tests? #f)) ;; 4/17 fail + (list + #:qtbase qtbase + #:configure-flags #~(list "-DQT_MAJOR_VERSION=6") + #:tests? #f)) ;; 4/17 fail (home-page "https://api.kde.org/frameworks/kuserfeedback/html/") (synopsis "Collect application feedback via telemetry and targeted surveys") diff --git a/gnu/packages/librewolf.scm b/gnu/packages/librewolf.scm index c84bcaf3ce..3e46477724 100644 --- a/gnu/packages/librewolf.scm +++ b/gnu/packages/librewolf.scm @@ -22,6 +22,7 @@ ;;; Copyright © 2022 Pierre Langlois <pierre.langlois@gmx.com> ;;; Copyright © 2023 Tomas Volf <wolf@wolfsden.cz> ;;; Copyright © 2023 Ian Eure <ian@retrospec.tv> +;;; Copyright © 2024 Remco van 't Veer <remco@remworks.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -261,7 +262,10 @@ "--disable-crashreporter" "--allow-addon-sideload" "--with-unsigned-addon-scopes=app,system" - "--disable-eme" + + ;; switch only available on x86, whereas EME + ;; is not supported on other targets + ,@(if #$(target-x86?) '("--disable-eme") '()) ;; Build details "--disable-debug" diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 1fde34b251..f36d0fc9ee 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -512,17 +512,17 @@ 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.9-version "6.9.7") +(define-public linux-libre-6.9-version "6.9.10") (define-public linux-libre-6.9-gnu-revision "gnu") (define deblob-scripts-6.9 (linux-libre-deblob-scripts linux-libre-6.9-version linux-libre-6.9-gnu-revision (base32 "1izfwmk0mxikx3bblcwiyrxdd4bg9v0jsph3i8gvrpjb7kw0lhna") - (base32 "0b8hsr0s4f3hps27bmd5qj1yknhd73q4zplr4v3lmq7sr57mgly6"))) + (base32 "18vfz1fx4vjssfh1w7aqfjf91y2g34a2qnzbl9pyawa7qnqxq33n"))) (define-public linux-libre-6.9-pristine-source (let ((version linux-libre-6.9-version) - (hash (base32 "1y01w26sas7pl24l09yczdr8mzzy2nadykz1wmhx9ygfj76qixg4"))) + (hash (base32 "18adcli0pazz7x62ws4hrj64prs6fmxln3p3xaii6zd6bwrjxlgg"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-6.9))) @@ -532,67 +532,67 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; Here are the support timelines: ;; <https://www.kernel.org/category/releases.html> -(define-public linux-libre-6.6-version "6.6.36") +(define-public linux-libre-6.6-version "6.6.41") (define-public linux-libre-6.6-gnu-revision "gnu") (define deblob-scripts-6.6 (linux-libre-deblob-scripts linux-libre-6.6-version linux-libre-6.6-gnu-revision (base32 "1a28pdl645bj4d8gac71dmwmll6a2kgd3k7gkpfvi94yqkzd9r2z") - (base32 "05ypqx1sz54yhb8jyxphvg5pwgb2cnzb4zqqaiyyywpqsrnya9kq"))) + (base32 "15xb4miirfmi1khlq4zhb8zmmh82f41jhsfbsfpv8v98yfka2nmb"))) (define-public linux-libre-6.6-pristine-source (let ((version linux-libre-6.6-version) - (hash (base32 "1mfdw2prjb54r19y22sm37q8spnk6lyk162ima7gps1pnwl6hrxr"))) + (hash (base32 "1vrjw0yhzmmnbrxyzjrfyz1s8bixciv1ly9pkgcqbasqh5brrjcy"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-6.6))) -(define-public linux-libre-6.1-version "6.1.96") +(define-public linux-libre-6.1-version "6.1.100") (define-public linux-libre-6.1-gnu-revision "gnu") (define deblob-scripts-6.1 (linux-libre-deblob-scripts linux-libre-6.1-version linux-libre-6.1-gnu-revision (base32 "1sf80f2i4vf888xjcn84ymn4w5ynn30ib9033zwmv7f09yvfhapy") - (base32 "0nq8b6rnn031wl0qz7ahyfs3hcb0qsr7hzdmxi2g33ycsm9955lk"))) + (base32 "11jbnj0d3262grf9vkn0668kvfxifxw98ccvn81wkaykll01k5nx"))) (define-public linux-libre-6.1-pristine-source (let ((version linux-libre-6.1-version) - (hash (base32 "1ab290vm6h8vj1qi1qhxzh9kc6dbgpkwybcwzw1aprz5kl3cjxry"))) + (hash (base32 "1fd8cmdni1lgjzgn74i5dih5kx3b1axqyhiddxn4s8qgl30nxamr"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-6.1))) -(define-public linux-libre-5.15-version "5.15.161") +(define-public linux-libre-5.15-version "5.15.163") (define-public linux-libre-5.15-gnu-revision "gnu") (define deblob-scripts-5.15 (linux-libre-deblob-scripts linux-libre-5.15-version linux-libre-5.15-gnu-revision (base32 "18ac30kxg2mf2f6gk3p935hzhz2qs110jy4xwk21kblnnkskbxj8") - (base32 "121shkzgixmywa19xx5f2yxg1primarpg4bxin3jyw0214xbfh2n"))) + (base32 "1l8dhfby3qx8vs8fq6yybixzrghbh03wflzwly4rq08wabcr87z8"))) (define-public linux-libre-5.15-pristine-source (let ((version linux-libre-5.15-version) - (hash (base32 "0k277hz6nq62v0xfc1n2hc69cyvmnxpl0qcbszinajywh23gfafn"))) + (hash (base32 "00mkipkhz0i5xld7kyaxcj8cj8faw4gmjl5fribg832nn7ccfpq2"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.15))) -(define-public linux-libre-5.10-version "5.10.220") +(define-public linux-libre-5.10-version "5.10.222") (define-public linux-libre-5.10-gnu-revision "gnu1") (define deblob-scripts-5.10 (linux-libre-deblob-scripts linux-libre-5.10-version linux-libre-5.10-gnu-revision (base32 "1b33rkn32b923025iiz4xzxiy8y5ii9j5qk4021mg575890rl4ch") - (base32 "12csh2zyjrqzgqcv799gv8h4xaw1irxh2zqddn4jqp5p7psx4j5k"))) + (base32 "1isiih0laz4wbivsg0pcvlgrflq3lv10fakv9lvg2b4s0yd9ybdn"))) (define-public linux-libre-5.10-pristine-source (let ((version linux-libre-5.10-version) - (hash (base32 "16z1xqm7djm8pl15s5wvgc4pwq81gydcf00jpxfplw794kwszhvw"))) + (hash (base32 "1jshn64g165rdshyjvq38ni6pkbskp50048pbz407fss7f00cbbv"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.10))) -(define-public linux-libre-5.4-version "5.4.278") +(define-public linux-libre-5.4-version "5.4.280") (define-public linux-libre-5.4-gnu-revision "gnu1") (define deblob-scripts-5.4 (linux-libre-deblob-scripts @@ -602,12 +602,12 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0x0xg0fcykpd117x3q0gim8jilhx922ashhckjvafxv2gk2zzjhj"))) (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "1245zf7vk2fyprw9fspljqy9wlzma9bayri7xx2g8iam2430d875"))) + (hash (base32 "0hix0dywf2ybvzxkijjsjmkrj7sx61hwq6mg1wqsq317p1zccxm9"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.316") +(define-public linux-libre-4.19-version "4.19.318") (define-public linux-libre-4.19-gnu-revision "gnu1") (define deblob-scripts-4.19 (linux-libre-deblob-scripts @@ -617,7 +617,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0fgkp3v7qgqpn7l1987xcwwlrmwsbscqnxfv06p8nkavrhymrv3c"))) (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "0lmyhwr4la7kvim7jqdi29scjkvqp9crpvdbhpb4j8d7mj5kgzz4"))) + (hash (base32 "14vl0288apl76rvxa9yxfggrc4600bjsn4gw097m4gy5ldiaapqd"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) @@ -1300,6 +1300,34 @@ Linux kernel. It has been modified to remove all non-free binary blobs.") ("CONFIG_SND_SOC_ES8316" . m)) (default-extra-linux-options linux-libre-version)))) +(define-public linux-libre-lts-arm64-generic + (make-linux-libre* linux-libre-lts-version + linux-libre-lts-gnu-revision + linux-libre-lts-source + '("aarch64-linux") + #:defconfig "defconfig" + #:extra-version "arm64-generic" + #:extra-options + (append + `(;; Provide support for ath9k wireless + ("CONFIG_ATH9K_HTC" . m) + ;; needed to fix the RTC on rockchip platforms + ("CONFIG_RTC_DRV_RK808" . #t) + ;; Pinebook display, battery, charger and usb + ("CONFIG_DRM_ANALOGIX_ANX6345" . m) + ("CONFIG_CHARGER_AXP20X" . m) + ("CONFIG_INPUT_AXP20X_PEK" . m) + ("CONFIG_CHARGER_AXP20X" . m) + ("CONFIG_BATTERY_AXP20X" . m) + ("CONFIG_PINCTRL_AXP209" . m) + ("CONFIG_AXP20X_POWER" . m) + ("CONFIG_AXP20X_ADC" . m) + ;; Pinebook PRO battery and sound support + ("CONFIG_BATTERY_CW2015" . m) + ("CONFIG_CHARGER_GPIO" . m) + ("CONFIG_SND_SOC_ES8316" . m)) + (default-extra-linux-options linux-libre-lts-version)))) + (define-public linux-libre-arm64-generic-5.10 (make-linux-libre* linux-libre-5.10-version linux-libre-5.10-gnu-revision @@ -7171,7 +7199,7 @@ not as a replacement for it.") (define-public hotspot (package (name "hotspot") - (version "1.5.0") + (version "1.5.1") (source (origin (method git-fetch) (uri (git-reference @@ -7183,7 +7211,7 @@ not as a replacement for it.") (file-name (git-file-name name version)) (sha256 (base32 - "17m96h0iahfjhbsa9flmsmbczvliy34vqvayzyh8bhldd8yh768l")))) + "04k2rvf2lgi8hp7dzqzn65fcd2lsiylwr04d44q75j0wvgbjjv1v")))) (build-system qt-build-system) (arguments (list @@ -7191,7 +7219,9 @@ not as a replacement for it.") ;; installed to a custom prefix and the build fails with "file cannot ;; create directory: /polkit-1/actions. Maybe need administrative" ;; (see: https://bugs.kde.org/show_bug.cgi?id=363678). - #:configure-flags #~(list "-DINSTALL_KAUTH_HELPER=OFF") + #:configure-flags #~(list "-DINSTALL_KAUTH_HELPER=OFF" + "-DQT6_BUILD=ON") + #:qtbase qtbase #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch-perfparser @@ -7262,6 +7292,7 @@ not as a replacement for it.") kcoreaddons kddockwidgets kgraphviewer + ki18n kio kiconthemes kitemmodels @@ -7272,12 +7303,8 @@ not as a replacement for it.") kwindowsystem libxkbcommon perf - qcustomplot - qtbase-5 - qtdeclarative-5 - qtquickcontrols2-5 - qtsvg-5 - qtx11extras + qtdeclarative + qtsvg solid threadweaver `(,zstd "lib")) diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 943fa6e5db..97f7dd357b 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -803,7 +803,7 @@ interface to the Tk widget system.") (define-public janet (package (name "janet") - (version "1.33.0") + (version "1.35.2") (source (origin (method git-fetch) @@ -812,7 +812,7 @@ interface to the Tk widget system.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "16wgljca7hp29fz5p2dnvy2cbscjx4imf85rhjwc1jkgdjswjxli")))) + (base32 "0kgya9zv8xq6mbrkpllm29zfxkr626ip83ivqkgqfcs5a33b39wa")))) (build-system gnu-build-system) (arguments (list #:make-flags diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index 62415f58f0..1e583b59b3 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -1361,7 +1361,7 @@ enabled.") (define-public fennel (package (name "fennel") - (version "1.4.2") + (version "1.5.0") (source (origin (method git-fetch) (uri (git-reference @@ -1370,7 +1370,7 @@ enabled.") (file-name (git-file-name name version)) (sha256 (base32 - "1h1i87jx889n1wczw5jvqmkx0jmlrq83pjspyd9v27j360d9fcik")))) + "0d25v7swq3msxsdzv91wwxy89y3qgw4bvzq1px89qsjzbbd7ccg2")))) (build-system gnu-build-system) (arguments (list #:make-flags #~(list (string-append "PREFIX=" diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index f0ae01614e..9035e45be8 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -11,6 +11,7 @@ ;;; Copyright © 2020 Fakhri Sajadi <f.sajadi@pantherx.org> ;;; Copyright © 2020 André Batista <nandre@riseup.net> ;;; Copyright © 2021, 2022 Brendan Tildesley <mail@brendan.scot> +;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -227,7 +228,7 @@ applications.") "DESTINATION \"share/polkit-1/actions")) #t))))) (inputs - (list kwindowsystem + (list kwindowsystem-5 libqtxdg libxscrnsaver polkit-qt @@ -280,7 +281,7 @@ and memory usage or network traffic.") (base32 "08b922gyg4591b399pw0y9zl3gr2627dw20c33abqpl30iq1fmd9")))) (build-system cmake-build-system) (inputs - (list kwindowsystem + (list kwindowsystem-5 liblxqt libqtxdg qtbase-5 @@ -315,7 +316,7 @@ LXQt and the system it's running on.") (base32 "1p9959rvj5kh1svv2p9dsfnf008xvrhllcccrsxnk4s8vzjhdqjp")))) (build-system cmake-build-system) (inputs - (list kwindowsystem + (list kwindowsystem-5 liblxqt libqtxdg polkit-qt @@ -354,7 +355,7 @@ the operating system LXQt is running on.") (build-system cmake-build-system) (inputs (list eudev - kwindowsystem + kwindowsystem-5 liblxqt libqtxdg libxcursor @@ -362,7 +363,7 @@ the operating system LXQt is running on.") qtbase-5 qtsvg-5 qtx11extras - solid + solid-5 xf86-input-libinput xkeyboard-config zlib)) @@ -371,7 +372,7 @@ the operating system LXQt is running on.") ;; XXX: This is a workaround so libkscreen can find the backends as we ;; dont have a way specify them. We may want to patch like Nix does. (propagated-inputs - (list libkscreen)) + (list libkscreen-5)) (arguments '(#:tests? #f ; no tests #:phases @@ -404,7 +405,7 @@ configuration of both LXQt and the underlying operating system.") (base32 "17km7yl5fqwhjy35w700s4rjxf9ann3vv6mw6l4r1cf7pvzmxhy7")))) (build-system cmake-build-system) (inputs - (list kwindowsystem + (list kwindowsystem-5 liblxqt libqtxdg qtbase-5 @@ -433,7 +434,7 @@ as a whole and are not limited to distinct applications.") (base32 "182mjvc17dvavk8vznhgnk6j1lv594bqv4796p2p1f4zdhq6fgm6")))) (build-system cmake-build-system) (inputs - (list kwindowsystem + (list kwindowsystem-5 liblxqt libqtxdg qtbase-5 @@ -461,7 +462,7 @@ according to the Desktop Notifications Specification.") (base32 "014jpyw4sgr63kjqdmksi6fsaz7pm5gkzr17f5rkaadx640ij4m0")))) (build-system cmake-build-system) (inputs - (list kwindowsystem + (list kwindowsystem-5 liblxqt libqtxdg qtbase-5 @@ -508,7 +509,7 @@ of other programs.") qtbase-5 qtsvg-5 qtx11extras - solid + solid-5 xcb-util xcb-util-image xkeyboard-config)) @@ -517,7 +518,7 @@ of other programs.") (propagated-inputs ;; Propagating KWINDOWSYSTEM so that the list of opened applications ;; shows up in lxqt-panel's taskbar plugin. - (list kwindowsystem lxmenu-data)) + (list kwindowsystem-5 lxmenu-data)) (arguments '(#:tests? #f ; no tests #:phases @@ -548,7 +549,7 @@ of other programs.") (base32 "051lb4kx29rx3ls3whlrbi83r9z9pdiqwyb1wbni56aqilv0svh0")))) (build-system cmake-build-system) (inputs - (list kwindowsystem + (list kwindowsystem-5 liblxqt libqtxdg pcre @@ -578,15 +579,15 @@ LXQt.") (base32 "17d1wh50pjjzqyxv3w7b4qlc1ym1p16yvbhyah9bzl2825irz9ar")))) (build-system cmake-build-system) (inputs - (list kidletime - kwindowsystem + (list kidletime-5 + kwindowsystem-5 liblxqt libqtxdg lxqt-globalkeys qtbase-5 qtsvg-5 qtx11extras - solid)) + solid-5)) (native-inputs (list lxqt-build-tools qttools-5)) (arguments '(#:tests? #f)) ; no tests @@ -647,7 +648,7 @@ Qt with LXQt.") (base32 "1916cl12v09x4iqrgvp2dwchy50wa97a0y68q4rdigarpdrp3x7j")))) (build-system cmake-build-system) (inputs - (list kwindowsystem + (list kwindowsystem-5 liblxqt libqtxdg lxqt-globalkeys @@ -679,7 +680,7 @@ allows for launching applications or shutting down the system.") (build-system cmake-build-system) (inputs (list eudev - kwindowsystem + kwindowsystem-5 liblxqt qtxdg-tools procps @@ -736,7 +737,7 @@ for the LXQt desktop environment.") (base32 "0pqz2pkzwq3af70s90p9x3a8rvlpl2jjb4mnjwgs1wz30cb7jrii")))) (build-system cmake-build-system) (inputs - (list kwindowsystem + (list kwindowsystem-5 liblxqt libqtxdg qtbase-5 @@ -964,7 +965,7 @@ window manager OpenBox.") (base32 "126zkj9jvjwxrh2fcm9h0c2iq9m5rm5hbkh155swijn2i8airxgx")))) (build-system cmake-build-system) (inputs - (list kwindowsystem + (list kwindowsystem-5 libxrender liblxqt libqtxdg @@ -1040,7 +1041,7 @@ QTermWidget.") (base32 "0xc004h7i2hnl3jj4p8v6wkqav2v07k1mzdvys3ya171z4ffmc9j")))) (build-system cmake-build-system) (inputs - (list kwindowsystem libqtxdg qtbase-5 qtsvg-5 qtx11extras)) + (list kwindowsystem-5 libqtxdg qtbase-5 qtsvg-5 qtx11extras)) (native-inputs (list pkg-config perl qttools-5)) (arguments @@ -1096,7 +1097,7 @@ like @command{tar} and @command{zip}.") (base32 "087641idpg7n8yhh5biis4wv52ayw3rddirwqb34bf5fwj664pw9")))) (build-system cmake-build-system) (inputs - (list kwindowsystem + (list kwindowsystem-5 qtbase-5 qtsvg-5 liblxqt diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 8ca9a6376e..02b3677764 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015-2024 Ricardo Wurmus <rekado@elephly.net> -;;; Copyright © 2016, 2020-2023 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2016, 2020-2024 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017, 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> @@ -549,8 +549,8 @@ Performance is achieved by using the LLVM JIT compiler.") (deprecated-package "guile-aiscm-next" guile-aiscm)) (define-public llama-cpp - (let ((commit "fed0108491a3a3cbec6c6480dc8667ffff9d7659") - (revision "2")) + (let ((commit "a5735e4426b19a3ebd0c653ad8ac01420458ee95") + (revision "3")) (package (name "llama-cpp") (version (git-version "0.0.0" revision commit)) @@ -562,19 +562,27 @@ Performance is achieved by using the LLVM JIT compiler.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "16rm9gy0chd6k07crm8rkl2j3hg7y7h0km7k6c8q7bmm2jrd64la")))) + (base32 "0nx55wchwf204ld6jygfn37cjrzc4lspwn5v0qk8i6p92499bv0h")))) (build-system cmake-build-system) (arguments (list - #:configure-flags #~'("-DLLAMA_BLAS=ON" - "-DLLAMA_BLAS_VENDOR=OpenBLAS" - - "-DLLAMA_NATIVE=OFF" ;no '-march=native' - "-DLLAMA_FMA=OFF" ;and no '-mfma', etc. - "-DLLAMA_AVX2=OFF" - "-DLLAMA_AVX512=OFF" - "-DLLAMA_AVX512_VBMI=OFF" - "-DLLAMA_AVX512_VNNI=OFF") + #:configure-flags + #~(list "-DBUILD_SHARED_LIBS=ON" + "-DLLAMA_BLAS=ON" + "-DLLAMA_BLAS_VENDOR=OpenBLAS" + (string-append "-DBLAS_INCLUDE_DIRS=" + #$(this-package-input "openblas") + "/include") + (string-append "-DBLAS_LIBRARIES=" + #$(this-package-input "openblas") + "/lib/libopenblas.so") + + "-DLLAMA_NATIVE=OFF" ;no '-march=native' + "-DLLAMA_FMA=OFF" ;and no '-mfma', etc. + "-DLLAMA_AVX2=OFF" + "-DLLAMA_AVX512=OFF" + "-DLLAMA_AVX512_VBMI=OFF" + "-DLLAMA_AVX512_VNNI=OFF") #:modules '((ice-9 textual-ports) (guix build utils) @@ -609,14 +617,14 @@ Performance is achieved by using the LLVM JIT compiler.") (mkdir-p bin) (make-script "convert-hf-to-gguf") (make-script "convert-llama-ggml-to-gguf") - (make-script "convert-lora-to-ggml") - (make-script "convert-persimmon-to-gguf") - (make-script "convert")))) + (make-script "convert-hf-to-gguf-update.py")))) (add-after 'install-python-scripts 'wrap-python-scripts (assoc-ref python:%standard-phases 'wrap)) (add-after 'install 'install-main (lambda _ - (copy-file "bin/main" (string-append #$output "/bin/llama"))))))) + (with-directory-excursion (string-append #$output "/bin") + (symlink "main" "llama")))) + ))) (inputs (list python)) (native-inputs (list pkg-config)) (propagated-inputs @@ -3856,7 +3864,7 @@ with image data, text data, and sequence data.") python-pyux python-sphinx python-requests)) - (home-page "https://github.com/keras-team/keras") + (home-page "https://keras.io/") (synopsis "High-level deep learning framework") (description "Keras is a high-level neural networks API, written in Python and capable of running on top of TensorFlow. It was developed with a focus on @@ -4090,7 +4098,7 @@ and Darknet.") inference. It contains the implementation of common neural network operators on quantized 8-bit tensors.") (supported-systems - '("armv7-linux" "aarch64-linux" "i686-linux" "x86_64-linux")) + '("armhf-linux" "aarch64-linux" "i686-linux" "x86_64-linux")) (license license:bsd-3)))) (define-public xnnpack @@ -4209,8 +4217,8 @@ instead it provides low-level performance primitives for accelerating high-level machine learning frameworks, such as TensorFlow Lite, TensorFlow.js, PyTorch, and MediaPipe.") (supported-systems - '("armv7-linux" "aarch64-linux" "riscv64-linux" - "i686-linux" "x86_64-linux" "i686-mingw" "x86_64-mingw")) + '("armhf-linux" "aarch64-linux" "riscv64-linux" + "i686-linux" "x86_64-linux")) (license license:bsd-3)))) ;; Warning: This package requires AVX2 or AVX-512 instructions. @@ -5319,74 +5327,70 @@ of Hidden Markov Models.") ;; Keep this in sync with the r-torch package. (define-public liblantern - ;; There has been no release or tagged commit for r-torch 0.12.0. The - ;; selected commit corresponds to the 0.12.0 release. - (let ((commit "4d83bd087be581f7db321c27f55897ff021d2537") - (revision "1")) - (package - (name "liblantern") - (version (git-version "0.11.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/mlverse/torch") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1xxc6vr7sr2mg0va0hc2fs4f6v5b78mx43dp2shzzbcgw90mgpvk")))) - (build-system cmake-build-system) - (arguments - (list - #:tests? #false ;no test target - #:phases - (let ((python-version (version-major+minor (package-version python)))) - #~(modify-phases %standard-phases - (add-after 'unpack 'chdir - (lambda _ (chdir "src/lantern"))) - (add-after 'chdir 'do-not-download-binaries - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "CMakeLists.txt" - (("find_package\\(Torch.*") "set(TORCH_CXX_FLAGS \"-ltorch\")\n") - (("retrieve_lib\\(.*") "")) - (let ((site-packages (string-append "/lib/python" - #$python-version - "/site-packages"))) - (setenv "LIBRARY_PATH" - (string-append - (search-input-directory - inputs (string-append site-packages "/torch/lib")) - ":" (or (getenv "LIBRARY_PATH") ""))) - (setenv "CPLUS_INCLUDE_PATH" - (string-append - (search-input-directory - inputs (string-append - site-packages "/torch/include/torch/csrc/api/include/")) - ":" - (search-input-directory - inputs (string-append site-packages "/torch/include/")) - ":" - (or (getenv "CPLUS_INCLUDE_PATH") ""))) - (setenv "C_INCLUDE_PATH" - (string-append - (search-input-directory - inputs (string-append site-packages "/torch/include/")) - ":" - (or (getenv "C_INCLUDE_PATH") "")))))) - (replace 'install - (lambda _ - (install-file - "../build/liblantern.so" - (string-append #$output "/lib")) - (copy-recursively - "../lantern/include" - (string-append #$output "/include")))))))) - (inputs (list python-pytorch-for-r-torch)) - (home-page "https://github.com/mlverse/torch/") - (synopsis "C API to libtorch") - (description - "Lantern provides a C API to the libtorch machine learning library.") - (license license:expat)))) + (package + (name "liblantern") + (version "0.13.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mlverse/torch") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1yy5xpn9mi5qm7k4w7040d6frpixm9ifs46v1cn9b6bpc1qs1a02")))) + (build-system cmake-build-system) + (arguments + (list + #:tests? #false ;no test target + #:phases + (let ((python-version (version-major+minor (package-version python)))) + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ (chdir "src/lantern"))) + (add-after 'chdir 'do-not-download-binaries + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "CMakeLists.txt" + (("find_package\\(Torch.*") "set(TORCH_CXX_FLAGS \"-ltorch\")\n") + (("retrieve_lib\\(.*") "")) + (let ((site-packages (string-append "/lib/python" + #$python-version + "/site-packages"))) + (setenv "LIBRARY_PATH" + (string-append + (search-input-directory + inputs (string-append site-packages "/torch/lib")) + ":" (or (getenv "LIBRARY_PATH") ""))) + (setenv "CPLUS_INCLUDE_PATH" + (string-append + (search-input-directory + inputs (string-append + site-packages "/torch/include/torch/csrc/api/include/")) + ":" + (search-input-directory + inputs (string-append site-packages "/torch/include/")) + ":" + (or (getenv "CPLUS_INCLUDE_PATH") ""))) + (setenv "C_INCLUDE_PATH" + (string-append + (search-input-directory + inputs (string-append site-packages "/torch/include/")) + ":" + (or (getenv "C_INCLUDE_PATH") "")))))) + (replace 'install + (lambda _ + (install-file + "../build/liblantern.so" + (string-append #$output "/lib")) + (copy-recursively + "../lantern/include" + (string-append #$output "/include")))))))) + (inputs (list python-pytorch-for-r-torch)) + (home-page "https://github.com/mlverse/torch/") + (synopsis "C API to libtorch") + (description + "Lantern provides a C API to the libtorch machine learning library.") + (license license:expat))) (define-public python-lap (package diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 6aacdcb73c..d4f7924747 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -49,7 +49,7 @@ ;;; Copyright © 2022 Thiago Jung Bauermann <bauermann@kolabnow.com> ;;; Copyright © 2022 Guillaume Le Vaillant <glv@posteo.net> ;;; Copyright © 2022 muradm <mail@muradm.net> -;;; Copyright © 2022 jgart <jgart@dismail.de> +;;; Copyright © 2022, 2024 jgart <jgart@dismail.de> ;;; Copyright © 2022 ( <paren@disroot.org> ;;; Copyright © 2022 Mathieu Laparie <mlaparie@disr.it> ;;; Copyright © 2023 Timo Wilken <guix@twilken.net> @@ -85,6 +85,7 @@ #:use-module (gnu packages c) #:use-module (gnu packages calendar) #:use-module (gnu packages check) + #:use-module (gnu packages code) #:use-module (gnu packages compression) #:use-module (gnu packages crypto) #:use-module (gnu packages curl) @@ -1643,7 +1644,7 @@ and search library.") (define-public bower (package (name "bower") - (version "1.0") + (version "1.1") (home-page "https://github.com/wangp/bower") (source (origin @@ -1653,7 +1654,7 @@ and search library.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0vcsbxlsvr2wv3c7sfr3yj21kbqy259skpxg00vf5bdkbc8qknq4")))) + (base32 "1zh2zlwdmpq6195kg87q5dh864jvabxnrvfvzhks53pf9wjkv80a")))) (build-system gnu-build-system) (arguments (list @@ -1975,7 +1976,7 @@ delivery.") (define-public exim (package (name "exim") - (version "4.97.1") + (version "4.98") (source (origin (method url-fetch) @@ -1989,7 +1990,7 @@ delivery.") (string-append "https://ftp.exim.org/pub/exim/exim4/old/" file-name)))) (sha256 - (base32 "1afzxyffjqm2xm5v6b731hbfm1fi4q35ja45a29kaycsa1bj0y5x")))) + (base32 "1xsjb2hqasxsqsmrcv98c2dvfgcsiy0j0g229fx974lzfy511g0f")))) (build-system gnu-build-system) (arguments (list #:phases @@ -3316,6 +3317,10 @@ from the Cyrus IMAP project.") ;; Fix some incorrectly hard-coded external tool file names. (add-after 'unpack 'patch-FHS-file-names (lambda _ + ;; avoids warning smtpd: couldn't enqueue offline message + ;; smtpctl exited abnormally + (substitute* "usr.sbin/smtpd/smtpd.h" + (("/usr/bin/smtpctl") "/run/setuid-programs/smtpctl")) (substitute* "usr.sbin/smtpd/smtpctl.c" ;; ‘gzcat’ is auto-detected at compile time, but ‘cat’ isn't. (("/bin/cat") (which "cat"))) @@ -4336,6 +4341,37 @@ related tools to process winmail.dat files.") Git and exports them in maildir format or to an MDA through a pipe.") (license license:gpl2)))) +(define-public bubger + (package + (name "bubger") + (version "1.1") + (source + (origin + (method url-fetch) + (uri + (string-append "https://git.causal.agency/bubger/snapshot/bubger-" + version ".tar.gz")) + (sha256 + (base32 "014r9p7f0ismhybvcs4p3s4ph3lcygn15kfdkd73i09fb82pqyw6")))) + (build-system gnu-build-system) + (arguments + (list #:tests? #f ; There are no tests. + #:make-flags + #~(list + (string-append "CC=" #$(cc-for-target)) + (string-append "PREFIX=" #$output)))) + (native-inputs + (list pkg-config universal-ctags)) + (inputs (list libressl)) + (home-page "https://code.causal.agency/june/bubger") + (synopsis "IMAP archive generator") + (description + "@command{bubger} is a mailing list archive generator for mail stored in +IMAP. It produces static files of HTML, Atom and mboxrd, making its output +easy to serve from a host without IMAP access. It requires the IMAP THREAD +extension.") + (license license:gpl3+))) + (define-public public-inbox (package (name "public-inbox") @@ -5097,7 +5133,7 @@ remote SMTP server.") go-github-com-creack-pty go-github-com-arran4-golang-ical go-github-com-protonmail-go-crypto - go-github-com-syndtr-goleveldb-leveldb + go-github-com-syndtr-goleveldb go-git-sr-ht-sircmpwn-getopt go-git-sr-ht-rockorager-tcell-term python diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index d39292e825..1265ae13e9 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1400,19 +1400,19 @@ in the terminal or with an external viewer.") (define-public gnuplot (package (name "gnuplot") - (version "5.4.9") + (version "6.0.1") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/gnuplot/gnuplot/" version "/gnuplot-" version ".tar.gz")) (sha256 - (base32 "15vabi30s4ln4vi82csx4nvfms3ik8704rk0prcm9h1xylhs0a53")))) + (base32 "16ipf7m2c2v1cldp3kwxbjj6db6bzy0rkrpp4kzhh61a3866cnp8")))) (build-system gnu-build-system) (native-inputs (list pkg-config (texlive-updmap.cfg))) (inputs - (list cairo gd lua pango readline)) + (list cairo gd libcerf lua pango readline)) (arguments (list #:configure-flags #~(list "--with-qt=no" @@ -1459,7 +1459,7 @@ C++ with a C API. It contains a LU and LLt solver, and a few other things.") (define-public primesieve (package (name "primesieve") - (version "11.1") + (version "12.3") (source (origin (method git-fetch) (uri (git-reference @@ -1468,7 +1468,7 @@ C++ with a C API. It contains a LU and LLt solver, and a few other things.") (file-name (git-file-name name version)) (sha256 (base32 - "0ja3kxvpya7bwrib40hnyahsiiiavf65ppk7i7afvc093b7gg9bg")))) + "1lxvs1jgch0zgpa5axx6zlvgab4rmm3lqpbah75072xpj8ndhhld")))) (build-system cmake-build-system) (arguments (list #:configure-flags #~(list "-DBUILD_STATIC_LIBS=off" @@ -1486,7 +1486,7 @@ C++ with a C API. It contains a LU and LLt solver, and a few other things.") (define-public cminpack (package (name "cminpack") - (version "1.3.8") + (version "1.3.9") (source (origin (method git-fetch) (uri (git-reference @@ -1495,7 +1495,7 @@ C++ with a C API. It contains a LU and LLt solver, and a few other things.") (file-name (git-file-name name version)) (sha256 (base32 - "1bg0954mwry22izsvikpai16pkfp8srz4z34n267bhkmrvvb0zgy")))) + "05cjb54in7kks70rrnmvczwkg4nsxhwyf23abxqdj143zwbz4yyr")))) (build-system cmake-build-system) (arguments (list #:configure-flags #~(list "-DBUILD_SHARED_LIBS=ON"))) @@ -3529,7 +3529,8 @@ September 2004}") "--with-openblas=1" (string-append "--with-openblas-dir=" #$(this-package-input "openblas")) - "--with-superlu=1") + "--with-superlu=1" + "--with-debugging=0") #:make-flags ;; Honor (parallel-job-count) for build. Do not use --with-make-np, ;; whose value is dumped to $out/lib/petsc/conf/petscvariables. @@ -7066,7 +7067,7 @@ evaluates expressions using the standard order of operations.") (define-public xaos (package (name "xaos") - (version "4.2.1") + (version "4.3.2") (source (origin (method git-fetch) (uri (git-reference @@ -7075,53 +7076,53 @@ evaluates expressions using the standard order of operations.") (file-name (git-file-name name version)) (sha256 (base32 - "0maw5am6rrkyjrprfg113zjq37mqj0iaznkg4h2927ff7wrprc94")))) + "0a5n3g1xcsd8k65q5skm4xsdllr3mmkahh4vi59db1l0jv81v06q")))) (build-system gnu-build-system) (native-inputs `(("gettext" ,gettext-minimal) - ("qtbase" ,qtbase-5) - ("qttools-5" ,qttools-5))) + ("qtbase" ,qtbase) + ("qttools" ,qttools))) (inputs (list libx11 zlib libpng gsl)) ;; The upstream project file ("XaoS.pro") and the Makefile it generates are ;; not enough for this package to install properly. These phases fix that. (arguments - `(#:tests? #f ;no "check" target - #:phases - (modify-phases %standard-phases - (add-before 'configure 'make-qt-deterministic - (lambda _ - ;; Make Qt deterministic. - (setenv "QT_RCC_SOURCE_DATE_OVERRIDE" "1") - #t)) - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (substitute* "XaoS.pro" - ;; The DESTDIR is originally set to install the xaos binary to - ;; the "bin" folder inside the build directory. Setting make - ;; flags doesn't seem to change this. - (("DESTDIR.*$") - (string-append "DESTDIR=" out "/bin")) - ;; Set the correct path to the lrelease binary. - (("lrelease-qt5") "lrelease")) - (substitute* "src/include/config.h" - (("/usr/share/XaoS") - (string-append out "/share/XaoS"))) - (invoke "qmake")))) - (add-after 'install 'install-data - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (share (string-append out "/share"))) - (mkdir-p share) - (for-each - (lambda (folder) - (copy-recursively folder - (string-append share "/XaoS/" folder))) - '("catalogs" "examples" "tutorial")) - (install-file "xdg/xaos.png" - (string-append share "/pixmaps")) - (install-file "xdg/xaos.desktop" - (string-append share "/applications"))) - #t))))) + (list #:tests? #f ;no "check" target + #:phases + #~(modify-phases %standard-phases + (add-before 'configure 'make-qt-deterministic + (lambda _ + ;; Make Qt deterministic. + (setenv "QT_RCC_SOURCE_DATE_OVERRIDE" "1"))) + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* "XaoS.pro" + ;; The DESTDIR is originally set to install the xaos binary to + ;; the "bin" folder inside the build directory. Setting make + ;; flags doesn't seem to change this. + (("DESTDIR.*$") + (string-append "DESTDIR=" out "/bin")) + (("/usr/local") + out) + ;; Set the correct path to the lrelease binary. + (("lrelease-qt6") "lrelease")) + (substitute* "src/include/config.h" + (("/usr/share/XaoS") + (string-append out "/share/XaoS"))) + (invoke "qmake")))) + (add-after 'install 'install-data + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (share (string-append out "/share"))) + (mkdir-p share) + (for-each + (lambda (folder) + (copy-recursively folder + (string-append share "/XaoS/" folder))) + '("catalogs" "examples" "tutorial")) + (install-file "xdg/xaos.png" + (string-append share "/pixmaps")) + (install-file "xdg/io.github.xaos_project.XaoS.desktop" + (string-append share "/applications")))))))) (synopsis "Real-time fractal zoomer") (description "GNU XaoS is a graphical program that generates fractal patterns and allows you to zoom in and out of them infinitely in a fluid, diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index efe0b2a784..ffcfd13833 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -154,14 +154,14 @@ parsers to allow execution with Guile as extension languages."))) (define-public mes (package (name "mes") - (version "0.26.2") + (version "0.27") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/mes/" "mes-" version ".tar.gz")) (sha256 (base32 - "120a7ljnyi9127inaarlqv6cl98cmk72s3gmyad7cjrwy6cvzf1g")))) + "1a5ag8i303yhf76sg05rpcans9vadvnpxcpa4sl09z4cv5bfcgh3")))) (supported-systems '("armhf-linux" "i686-linux" "x86_64-linux" "riscv64-linux")) (propagated-inputs (list mescc-tools nyacc-1.00.2)) @@ -257,7 +257,7 @@ get_machine.") (build-system gnu-build-system) (supported-systems '("i686-linux" "x86_64-linux" "armhf-linux" "aarch64-linux" - "riscv32-linux" "riscv64-linux")) + "riscv64-linux")) (arguments `(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")) ,(string-append "CC=" (cc-for-target))) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 9ba83c0712..083a86ed8b 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -117,6 +117,7 @@ #:use-module (gnu packages ncurses) #:use-module (gnu packages networking) #:use-module (gnu packages nss) + #:use-module (gnu packages password-utils) #:use-module (gnu packages pcre) #:use-module (gnu packages perl) #:use-module (gnu packages photo) @@ -141,6 +142,7 @@ #:use-module (gnu packages textutils) #:use-module (gnu packages tls) #:use-module (gnu packages video) + #:use-module (gnu packages vulkan) #:use-module (gnu packages web) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xiph) @@ -1091,14 +1093,14 @@ control of your private keys, no previous conversation is compromised.") (define-public znc (package (name "znc") - (version "1.8.2") + (version "1.9.1") (source (origin (method url-fetch) (uri (string-append "https://znc.in/releases/archive/znc-" version ".tar.gz")) (sha256 (base32 - "03fyi0j44zcanj1rsdx93hkdskwfvhbywjiwd17f9q1a7yp8l8zz")))) + "0g2gi7207lydmm7zdq52ivw0vhvbnmhsybi89q5m3bcsw60cz9z8")))) (build-system cmake-build-system) (arguments `(#:configure-flags @@ -1114,15 +1116,16 @@ control of your private keys, no previous conversation is compromised.") (let ((source (assoc-ref inputs "googletest-source")) (target "third_party/googletest")) (mkdir-p target) - (copy-recursively source target) - #t)))))) + (copy-recursively source target))))))) (native-inputs `(("boost" ,boost) ("gettext" ,gettext-minimal) ("googletest-source" ,(package-source googletest)) ("pkg-config" ,pkg-config))) (inputs - (list cyrus-sasl + ;; FIXME: Package cctz and remove the bundled copy from the source tarball. + (list argon2 + cyrus-sasl icu4c openssl perl @@ -1499,7 +1502,7 @@ default.") qtbase-5 qtdeclarative-5 qtgraphicaleffects - qtlocation + qtlocation-5 qtquickcontrols2-5 qtsvg-5 qtmultimedia-5 @@ -2419,7 +2422,7 @@ QMatrixClient project.") (define-public mtxclient (package (name "mtxclient") - (version "0.9.1") + (version "0.10.0") (source (origin (method git-fetch) @@ -2428,20 +2431,19 @@ QMatrixClient project.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0m8agc3c4n03r92nz3gxkpxmj2c3ncf125nmfdv0jf24gxib126z")))) - (arguments - `(#:configure-flags - (list - ;; Disable example binaries (not installed) - "-DBUILD_LIB_EXAMPLES=OFF") - #:phases - (modify-phases %standard-phases - (add-before 'configure 'disable-network-tests - (lambda _ - (substitute* "CMakeLists.txt" - (("add_test\\((BasicConnectivity|ClientAPI|Devices|MediaAPI|Encryption|Pushrules)") - "# add_test"))))))) + (base32 "10iidyxjk3w6cljw2r62i5azx84nw3p8hw97d8vy7r5gh1nrrrcn")))) (build-system cmake-build-system) + (arguments + (list + #:configure-flags + #~(list "-DBUILD_LIB_EXAMPLES=OFF") ; disable example binaries (not installed) + #:phases + #~(modify-phases %standard-phases + (add-before 'configure 'disable-network-tests + (lambda _ + (substitute* "CMakeLists.txt" + (("add_test\\((BasicConnectivity|ClientAPI|Devices|MediaAPI|Encryption|Pushrules)") + "# add_test"))))))) (inputs (list boost coeurl @@ -2465,7 +2467,7 @@ for the Matrix protocol. It is built on to of @code{Boost.Asio}.") (define-public nheko (package (name "nheko") - (version "0.11.3") + (version "0.12.0") (source (origin (method git-fetch) @@ -2474,41 +2476,25 @@ for the Matrix protocol. It is built on to of @code{Boost.Asio}.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0yjbxyba87nkpjmql7s6nv2r2i9s956zgwlfhdi4jjg96v2rgmnr")) + (base32 "113ids1k2pjmvs9cgh025vkpg5mipw295dlkx7n3ydi0r8mzw1l5")) (modules '((guix build utils))) - (snippet - '(begin - (delete-file-recursively "third_party"))))) + (snippet '(delete-file-recursively "third_party")))) (arguments (list #:tests? #f ;no test target + #:qtbase qtbase #:configure-flags #~(list "-DCMAKE_BUILD_TYPE=Release" ;; Fix required because we are using a static SingleApplication "-DCMAKE_CXX_FLAGS= \"-DQAPPLICATION_CLASS=QApplication\" " ;; Compile Qml will make Nheko faster, but you will need to recompile ;; it, when you update Qt. That's fine for us. - "-DCOMPILE_QML=ON") + "-DCOMPILE_QML=ON" + ;; Use system libraries. + "-DUSE_BUNDLED_BLURHASH=OFF" + "-DUSE_BUNDLED_CPPHTTPLIB=OFF") #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'unbundle-dependencies - (lambda* (#:key inputs #:allow-other-keys) - (let ((libSingleApplication.a - (search-input-file inputs "lib/libSingleApplication.a")) - (httplib.h (search-input-file inputs "include/httplib.h"))) - (substitute* "CMakeLists.txt" - ;; Remove include and source dirs,replace with the correct one - (("third_party/blurhash/blurhash\\.[ch]pp") "") - (("third_party/cpp-httplib-0\\.5\\.12") - (dirname httplib.h)) - (("add_subdirectory.*third_party/SingleApplication.*") "") - ;; Link using the correct static/shared libs - (("SingleApplication::SingleApplication") - (string-append - ;; Dynamic libraries - "httplib" "\n" "blurhash" "\n" - ;; Static library - libSingleApplication.a)))))) (add-after 'unpack 'fix-determinism (lambda _ ;; Make Qt deterministic. @@ -2520,37 +2506,37 @@ for the Matrix protocol. It is built on to of @code{Boost.Asio}.") `("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path))))))))) (build-system qt-build-system) (inputs - (list boost - blurhash - cpp-httplib + (list blurhash + brotli cmark coeurl + cpp-httplib curl gst-plugins-base gst-plugins-bad ; sdp & webrtc for voip gst-plugins-good-qt ; rtpmanager for voip - nlohmann-json + kdsingleapplication libevent libnice ; for voip - olm + libxkbcommon lmdb lmdbxx mtxclient + nlohmann-json + olm openssl - qtbase-5 - qtdeclarative-5 - qtkeychain + qtdeclarative qtgraphicaleffects - qtmultimedia-5 - qtquickcontrols2-5 - qtsvg-5 + qtkeychain-qt6 + qtmultimedia + qtsvg re2 spdlog - single-application-qt5 - xcb-util-wm + vulkan-headers + vulkan-loader zlib)) (native-inputs - (list asciidoc pkg-config qttools-5)) + (list asciidoc pkg-config qttools)) (home-page "https://github.com/Nheko-Reborn/nheko") (synopsis "Desktop client for Matrix using Qt and C++14") (description "@code{Nheko} want to provide a native desktop app for the @@ -3304,7 +3290,6 @@ designed for experienced users.") (build-system go-build-system) (arguments (list - #:go go-1.21 #:import-path "github.com/42wim/matterbridge")) (synopsis "Bridge together various messaging networks and protocols") (description diff --git a/gnu/packages/mingw.scm b/gnu/packages/mingw.scm index 0ac6f0e767..ea579d4043 100644 --- a/gnu/packages/mingw.scm +++ b/gnu/packages/mingw.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2019 Carl Dong <contact@carldong.me> ;;; Copyright © 2021 Léo Le Bouter <lle-bout@zaclys.net> +;;; Copyright © 2024 Foundation Devices, Inc. <hello@foundation.xyz> ;;; ;;; This file is part of GNU Guix. ;;; @@ -24,15 +25,17 @@ #:use-module (gnu packages) #:use-module (gnu packages cross-base) #:use-module (guix build-system gnu) + #:use-module (guix gexp) + #:use-module (guix memoization) #:use-module (guix packages) #:use-module (guix download) #:export (make-mingw-w64)) -(define* (make-mingw-w64 machine - #:key - xgcc - xbinutils - with-winpthreads?) +(define* (make-mingw-w64/implementation machine + #:key + xgcc + xbinutils + with-winpthreads?) "Return a mingw-w64 for targeting MACHINE. If XGCC or XBINUTILS is specified, use that gcc or binutils when cross-compiling. If WITH-WINPTHREADS? is specified, recurse and return a mingw-w64 with support for winpthreads." @@ -40,7 +43,7 @@ specified, recurse and return a mingw-w64 with support for winpthreads." (package (name (string-append "mingw-w64" "-" machine (if with-winpthreads? "-winpthreads" ""))) - (version "11.0.1") + (version "12.0.0") (source (origin (method url-fetch) @@ -48,11 +51,7 @@ specified, recurse and return a mingw-w64 with support for winpthreads." "mirror://sourceforge/mingw-w64/mingw-w64/" "mingw-w64-release/mingw-w64-v" version ".tar.bz2")) (sha256 - (base32 "047f4m37kxf7g8qj23qplrzfd9cirfkkv8d175sfv2zfd7hbqriz")) - (patches - (search-patches "mingw-w64-6.0.0-gcc.patch" - "mingw-w64-dlltool-temp-prefix.patch" - "mingw-w64-reproducible-gendef.patch")))) + (base32 "0bzdprdrb8jy5dhkl2j2yhnr2nsiv6wk2wzxrzaqsvjbmj58jhfc")))) (native-inputs `(("xgcc-core" ,(if xgcc xgcc (cross-gcc triplet))) ("xbinutils" ,(if xbinutils xbinutils (cross-binutils triplet))) @@ -74,37 +73,48 @@ specified, recurse and return a mingw-w64 with support for winpthreads." ,(string-append triplet "/lib") ,(string-append triplet "/lib64")))))) (arguments - `(#:configure-flags '(,(string-append "--host=" triplet) - ,@(if with-winpthreads? - '("--with-libraries=winpthreads") - '())) - #:phases - (modify-phases %standard-phases - (add-before 'configure 'setenv - (lambda* (#:key inputs #:allow-other-keys) - (let ((xgcc-core (assoc-ref inputs "xgcc-core")) - (mingw-headers (string-append - (getcwd) "/mingw-w64-headers"))) - (setenv "CPP" - (string-append - xgcc-core ,(string-append "/bin/" triplet "-cpp"))) - (setenv "CROSS_C_INCLUDE_PATH" - (string-append - mingw-headers - ":" mingw-headers "/include" - ":" mingw-headers "/crt" - ":" mingw-headers "/defaults/include" - ":" mingw-headers "/direct-x/include")) - (when ,with-winpthreads? - (let ((xlibc (assoc-ref inputs "xlibc"))) - (setenv "CROSS_LIBRARY_PATH" - (string-append - xlibc "/lib" ":" - xlibc "/" ,triplet "/lib")))))))) - #:make-flags (list "DEFS=-DHAVE_CONFIG_H -D__MINGW_HAS_DXSDK=1") - #:parallel-build? #f ; parallel builds often fail with empty .a files - #:tests? #f ; compiles and includes glibc headers - #:strip-binaries? #f)) + (list #:parallel-build? #f ; parallel builds often fail with empty .a files + #:tests? #f ; compiles and includes glibc headers + #:strip-binaries? #f + #:configure-flags + #~(list #$(string-append "--host=" triplet) + #$@(if with-winpthreads? + #~("--with-libraries=winpthreads") + #~()) + ;; The default msvcrt changed on 12.0.0 to use UCRT as the + ;; default, this could cause problems with programs expecting + ;; MSVCRT as the default. + ;; + ;; XXX: A new target to use UCRT can be introduced as + ;; the MSYS2 project does, e.g: x86_64-w64-ucrt-mingw32. + "--with-default-msvcrt=msvcrt") + #:make-flags #~'("DEFS=-DHAVE_CONFIG_H -D__MINGW_HAS_DXSDK=1") + #:phases + #~(modify-phases %standard-phases + (add-before 'configure 'setenv + (lambda _ + (let ((xgcc-core #+(this-package-native-input + "xgcc-core")) + (mingw-headers (string-append + (getcwd) "/mingw-w64-headers"))) + (setenv "CPP" + (string-append + xgcc-core "/bin/" #$triplet "-cpp")) + (setenv "CROSS_C_INCLUDE_PATH" + (string-append + mingw-headers + ":" mingw-headers "/include" + ":" mingw-headers "/crt" + ":" mingw-headers "/defaults/include" + ":" mingw-headers "/direct-x/include")) + #$@(if with-winpthreads? + #~((let ((xlibc #+(this-package-native-input + "xlibc"))) + (setenv "CROSS_LIBRARY_PATH" + (string-append + xlibc "/lib" ":" + xlibc "/" #$triplet "/lib")))) + #~()))))))) (home-page "https://mingw-w64.org") (synopsis "Minimalist GNU for Windows") (description @@ -119,6 +129,9 @@ Mingw-w64 is an advancement of the original mingw.org project and provides several new APIs such as DirectX and DDK, and 64-bit support.") (license license:fdl1.3+)))) +(define make-mingw-w64 + (memoize make-mingw-w64/implementation)) + (define-public mingw-w64-i686 (make-mingw-w64 "i686")) @@ -138,7 +151,7 @@ several new APIs such as DirectX and DDK, and 64-bit support.") (define-public mingw-w64-tools (package (name "mingw-w64-tools") - (version "11.0.1") + (version "12.0.0") (source (origin (method url-fetch) @@ -146,48 +159,44 @@ several new APIs such as DirectX and DDK, and 64-bit support.") "mirror://sourceforge/mingw-w64/mingw-w64/" "mingw-w64-release/mingw-w64-v" version ".tar.bz2")) (sha256 - (base32 "047f4m37kxf7g8qj23qplrzfd9cirfkkv8d175sfv2zfd7hbqriz")))) + (base32 "0bzdprdrb8jy5dhkl2j2yhnr2nsiv6wk2wzxrzaqsvjbmj58jhfc")))) (build-system gnu-build-system) (arguments - `(#:modules ((guix build gnu-build-system) + (list + #:modules '((guix build gnu-build-system) (guix build utils) (srfi srfi-1)) - #:phases - (append - (modify-phases %standard-phases - (add-after 'unpack 'cd-gendef - (lambda _ - (chdir "mingw-w64-tools/gendef")))) - (modify-phases %standard-phases - (replace 'unpack - (lambda _ - (chdir "../genidl")))) - (modify-phases %standard-phases - (replace 'unpack - (lambda _ - (chdir "../genlib")))) - (modify-phases %standard-phases - (replace 'unpack - (lambda _ - (chdir "../genpeimg")))) - (append-map - (lambda (target) - (modify-phases %standard-phases - (replace 'unpack - (lambda _ - (chdir "../widl") - (false-if-exception - (delete-file-recursively "../build")) - #t)) - (replace 'configure - (lambda args - (apply (assoc-ref %standard-phases 'configure) - (append args (list #:out-of-source? #t - #:configure-flags - `("--target" ,target - "--program-prefix" - ,(string-append target "-"))))))))) - '("i686-w64-mingw32" "x86_64-w64-mingw32"))))) + #:phases + #~(append + (modify-phases %standard-phases + (add-after 'unpack 'cd-gendef + (lambda _ + (chdir "mingw-w64-tools/gendef")))) + (modify-phases %standard-phases + (replace 'unpack + (lambda _ + (chdir "../genidl")))) + (modify-phases %standard-phases + (replace 'unpack + (lambda _ + (chdir "../genpeimg")))) + (append-map + (lambda (target) + (modify-phases %standard-phases + (replace 'unpack + (lambda _ + (chdir "../widl") + (false-if-exception + (delete-file-recursively "../build")))) + (replace 'configure + (lambda args + (apply (assoc-ref %standard-phases 'configure) + (append args (list #:out-of-source? #t + #:configure-flags + `("--target" ,target + "--program-prefix" + ,(string-append target "-"))))))))) + '("i686-w64-mingw32" "x86_64-w64-mingw32"))))) (home-page "https://mingw-w64.org") (synopsis "Tools of Minimalist GNU for Windows") (description "This package provides the tools of Minimalist GNU for diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index 6270108b16..4c18da30ef 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -35,6 +35,7 @@ #:use-module (guix build-system python) #:use-module (gnu packages) #:use-module (gnu packages base) + #:use-module (gnu packages bash) #:use-module (gnu packages compression) #:use-module (gnu packages fabric-management) #:use-module (gnu packages gcc) @@ -143,7 +144,7 @@ bind processes, and much more.") (define-public hwloc-2 (package (inherit hwloc-1) - (version "2.10.0") + (version "2.11.1") (source (origin (method url-fetch) (uri (string-append "https://download.open-mpi.org/release/hwloc/v" @@ -151,11 +152,12 @@ bind processes, and much more.") "/hwloc-" version ".tar.bz2")) (sha256 (base32 - "14hkmq2hrs4j5f0sf32aazgbhgbdvj7lwapy35jvwbyyr5hds183")))) + "1ikhg35pll9zs628n2nii3ranz9j850hykqqcrgy2p12mpzzpk84")))) - ;; libnuma is no longer needed. + (native-inputs (modify-inputs (package-native-inputs hwloc-1) + (append bash))) ;for completion tests (inputs (modify-inputs (package-inputs hwloc-1) - (delete "numactl"))) + (delete "numactl"))) ;libnuma is no longer needed. (arguments (substitute-keyword-arguments (package-arguments hwloc-1) ((#:phases phases) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index cb29fa5816..100a41f87b 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -5389,7 +5389,7 @@ includes LV2 plugins and a JACK standalone client.") (define-public musescore (package (name "musescore") - (version "4.2.1") + (version "4.3.2") (source (origin (method git-fetch) @@ -5398,7 +5398,7 @@ includes LV2 plugins and a JACK standalone client.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0rc5ma1k0cjllfl86apbyj61sh0691lsmqnvqicyn0zi53z8w9v0")) + (base32 "1hx0l6d7avyfbh88hwn01h9q51mgd9zix91q2kgg1ax73pqxhfs2")) (modules '((guix build utils))) (snippet '(begin @@ -5534,7 +5534,7 @@ studio.") (define-public gsequencer (package (name "gsequencer") - (version "6.5.2") + (version "6.16.8") (source (origin (method git-fetch) @@ -5543,7 +5543,7 @@ studio.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "16rkwb60v7igixligkcm86l8l8vab1bhmwg8m7ihb051ryqixa3i")))) + (base32 "1qp78j6gicm4ixkx5ihn2lilw3a2863y05zvw8w5gigyc2zmbqpp")))) (build-system glib-or-gtk-build-system) (arguments `(#:phases @@ -6127,8 +6127,8 @@ console music players.") (license license:gpl3+))) (define-public demlo - (let ((commit "fe9ec4c8ac2fa995ec18e6ac86d50d46df06ec01") - (revision "0")) + (let ((commit "985f81047a67c795e67f628b550064558476a7c3") + (revision "1")) (package (name "demlo") (version (git-version "3.8" revision commit)) @@ -6142,7 +6142,7 @@ console music players.") (file-name (git-file-name name version)) (sha256 (base32 - "1afkbqhzn6da7zaf5ab7dvyqj1izqhzprwfb4hw448fllda9bdvk")))) + "1wx7pwgvg1fiq55jdc22353frcdlz548g97dy4j353lqxy8vxfyj")))) (build-system go-build-system) (native-inputs (list lua @@ -6157,7 +6157,8 @@ console music players.") (inputs (list chromaprint ffmpeg)) (arguments - `(#:import-path "gitlab.com/ambrevar/demlo" + `(#:go ,go-1.17 + #:import-path "gitlab.com/ambrevar/demlo" #:phases (modify-phases %standard-phases (add-after 'install 'wrap-program diff --git a/gnu/packages/ncdu.scm b/gnu/packages/ncdu.scm index 7b93dab9f6..f68b682fbb 100644 --- a/gnu/packages/ncdu.scm +++ b/gnu/packages/ncdu.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014 John Darrington <jmd@gnu.org> ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr> -;;; Copyright © 2022, 2023 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2022-2024 Efraim Flashner <efraim@flashner.co.il> ;;; ;;; This file is part of GNU Guix. ;;; @@ -36,14 +36,14 @@ ;; yet, so we'll keep both for just a little longer. (package (name "ncdu") - (version "1.19") + (version "1.20") (source (origin (method url-fetch) (uri (string-append "https://dev.yorhel.nl/download/ncdu-" version ".tar.gz")) (sha256 (base32 - "0zdidd4rhik5j0qdrdg1yh9094jlw496q07vqx90gphc30ck0dih")))) + "0wlmpq8gzcl1fim8jba3g0q0bbn4jcrbkns2n95kfwmy3a2bpqjz")))) (build-system gnu-build-system) (inputs (list ncurses)) (synopsis "Ncurses-based disk usage analyzer") diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index c94f772b74..91aaccf06d 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1002,7 +1002,7 @@ tasks.") (build-system qt-build-system) (arguments (list #:tests? #f)) ;There are no tests upstream - (inputs (list qtbase-5 networkmanager-qt)) + (inputs (list qtbase-5 networkmanager-qt5)) (native-inputs (list qttools-5 pkg-config)) (synopsis "NetworkManager front-end with information icon residing in system tray") @@ -2737,7 +2737,7 @@ that block port 22.") (define-public iperf (package (name "iperf") - (version "3.16") + (version "3.17.1") (source (origin (method git-fetch) @@ -2746,7 +2746,7 @@ that block port 22.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0m8zhr050qgmkkaf0jgn2isrr7yyk8majx9c18pf1xsqpr00sxs6")))) + (base32 "14pspy3348114r7rm2gj8h4qjhq8r8q7khrfqg8ln4vi1p9dq2x5")))) (build-system gnu-build-system) (arguments `(#:configure-flags @@ -4627,7 +4627,6 @@ QUIC protocol.") ;; TODO: figure out how tests are run #:tests? #f #:install-source? #f - #:go go-1.21 #:phases #~(modify-phases %standard-phases (replace 'build @@ -4722,7 +4721,6 @@ IPv6 Internet connectivity - it also works over IPv4.") (build-system go-build-system) (arguments (list - #:go go-1.20 #:import-path "github.com/slackhq/nebula" #:install-source? #f #:phases @@ -4828,8 +4826,7 @@ on hub/switched networks. It is based on @acronym{ARP} packets, it will send "1kbcr6580a9pi0a3wssnfr3mnxqq2k9w1fg4khikn82lqaljab2f")))) (build-system go-build-system) (arguments - (list #:go go-1.21 - #:install-source? #f + (list #:install-source? #f #:import-path "github.com/macronut/phantomsocks" #:build-flags #~'("-tags" #$(if (target-linux?) "rawsocket" diff --git a/gnu/packages/nss.scm b/gnu/packages/nss.scm index d558079f44..9224a8ed5a 100644 --- a/gnu/packages/nss.scm +++ b/gnu/packages/nss.scm @@ -323,11 +323,12 @@ security standards.") ;; These tests fail with the current builder network setup "--skip=ffi::test_gethostbyaddr_r" "--skip=ffi::test_gethostbyname2_r") + #:install-source? #f #:cargo-inputs (("rust-anyhow" ,rust-anyhow-1) ("rust-atoi" ,rust-atoi-2) ("rust-slog" ,rust-slog-2) - ("rust-slog-async" ,rust-slog-async-2-8) + ("rust-slog-async" ,rust-slog-async-2) ("rust-slog-term" ,rust-slog-term-2) ("rust-crossbeam-channel" ,rust-crossbeam-channel-0.5) ("rust-nix" ,rust-nix-0.28) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 40747686c4..77bda7f231 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -178,8 +178,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.4.0") - (commit "1a34b9b725e731a6d5f602d104f09a1c68afa6a4") - (revision 22)) + (commit "843b85c42745d65c93d6af81cd3a9d835ff1f51c") + (revision 23)) (package (name "guix") @@ -195,7 +195,7 @@ (commit commit))) (sha256 (base32 - "0fz7n9pl0g3cw3zvx9m5c51ly5m9ga71v85mf4jqp7x8j5g21lhy")) + "080idxx8i0dkwsvbx3yw20fs16v0vfzc7vc30zbvc96nvw36ryqb")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments @@ -889,7 +889,7 @@ high-performance computing} clusters.") (target-x86-32?)) (list libcpuid) '()))) - (home-page "https://nixos.org/nix/") + (home-page "https://nixos.org/") (synopsis "The Nix package manager") (description "Nix is a purely functional package manager. This means that it treats diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index 7bd2834e13..2e00701582 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014, 2020 Eric Bavier <bavier@posteo.net> ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org> -;;; Copyright © 2015-2018, 2020-2023 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2015-2018, 2020-2024 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Pjotr Prins <pjotr.guix@thebird.nl> ;;; Copyright © 2016 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2016, 2020, 2021, 2022, 2023 Ricardo Wurmus <rekado@elephly.net> @@ -68,14 +68,14 @@ (define-public parallel (package (name "parallel") - (version "20240622") + (version "20240722") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/parallel/parallel-" version ".tar.bz2")) (sha256 - (base32 "1m9qpx6c7b62s1kjp6aj0qfnj3fw2pl72q32bdykqi5x0z4i1qip")) + (base32 "1w2k1s7fmbj7csnmxxzvg07i5vgja1ddhjj6m6z2ibvnyxqm8cy7")) (snippet '(begin (use-modules (guix build utils)) @@ -554,7 +554,7 @@ obtain information about the CPU being used: supported instruction set, processor name, cache information, and topology information.") ;; On aarch64-linux, there is a bug reported upstream: ;; https://github.com/pytorch/cpuinfo/issues/14 - (supported-systems '("armv7-linux" "i686-linux" "x86_64-linux")) + (supported-systems '("armhf-linux" "i686-linux" "x86_64-linux")) (license license:bsd-2)))) (define-public clog diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 499c8b8312..b684eb60f3 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -151,7 +151,7 @@ human.") (define-public keepassxc (package (name "keepassxc") - (version "2.7.8") + (version "2.7.9") (source (origin (method url-fetch) @@ -159,7 +159,7 @@ human.") "/releases/download/" version "/keepassxc-" version "-src.tar.xz")) (sha256 - (base32 "18w32yw5y6dsadpibd3wf40vqa95grdss25r4im6bj5k28bi1lw7")))) + (base32 "1za6xnwnq68gswz8vh7s5wia1bdhnia11hcb7p3dl3f049gy8i1w")))) (build-system qt-build-system) (arguments (list diff --git a/gnu/packages/patches/appstream-force-reload-stemmer.patch b/gnu/packages/patches/appstream-force-reload-stemmer.patch deleted file mode 100644 index a2cf84c8b1..0000000000 --- a/gnu/packages/patches/appstream-force-reload-stemmer.patch +++ /dev/null @@ -1,89 +0,0 @@ -From 32182d7a7a67d0d204cd0a37bd211bfd0177bc27 Mon Sep 17 00:00:00 2001 -Message-ID: <32182d7a7a67d0d204cd0a37bd211bfd0177bc27.1700093066.git.vivien@planete-kraus.eu> -From: Matthias Klumpp <matthias@tenstral.net> -Date: Thu, 16 Nov 2023 00:59:15 +0100 -Subject: [PATCH] stemmer: Resolve potential issue where stemmer may never be - initialized - -If the initial locale was equal to the current stemming language, we may -never have initialized the stemmer (which could lead to crashes or -stemming being disabled). - -So we force the reload to always happen on initialization. -CC: #558 ---- - src/as-stemmer.c | 33 +++++++++++++++++++++------------ - 1 file changed, 21 insertions(+), 12 deletions(-) - -diff --git a/src/as-stemmer.c b/src/as-stemmer.c -index 63d45267..16ebd09b 100644 ---- a/src/as-stemmer.c -+++ b/src/as-stemmer.c -@@ -47,6 +47,8 @@ G_DEFINE_TYPE (AsStemmer, as_stemmer, G_TYPE_OBJECT) - - static gpointer as_stemmer_object = NULL; - -+static void as_stemmer_reload_internal (AsStemmer *stemmer, const gchar *locale, gboolean force); -+ - /** - * as_stemmer_finalize: - **/ -@@ -76,21 +78,14 @@ as_stemmer_init (AsStemmer *stemmer) - - /* we don't use the locale in XML, so it can be POSIX */ - locale = as_get_current_locale_posix (); -- stemmer->current_lang = as_utils_locale_to_language (locale); - -- as_stemmer_reload (stemmer, stemmer->current_lang); -+ /* force a reload for initialization */ -+ as_stemmer_reload_internal (stemmer, locale, TRUE); - #endif - } - --/** -- * as_stemmer_reload: -- * @stemmer: A #AsStemmer -- * @locale: The stemming language as POSIX locale. -- * -- * Allows realoading the #AsStemmer with a different language. -- */ --void --as_stemmer_reload (AsStemmer *stemmer, const gchar *locale) -+static void -+as_stemmer_reload_internal (AsStemmer *stemmer, const gchar *locale, gboolean force) - { - #ifdef HAVE_STEMMING - g_autofree gchar *lang = NULL; -@@ -99,7 +94,7 @@ as_stemmer_reload (AsStemmer *stemmer, const gchar *locale) - /* check if we need to reload */ - lang = as_utils_locale_to_language (locale); - locker = g_mutex_locker_new (&stemmer->mutex); -- if (as_str_equal0 (lang, stemmer->current_lang)) { -+ if (!force && as_str_equal0 (lang, stemmer->current_lang)) { - g_mutex_locker_free (locker); - return; - } -@@ -119,6 +114,20 @@ as_stemmer_reload (AsStemmer *stemmer, const gchar *locale) - #endif - } - -+/** -+ * as_stemmer_reload: -+ * @stemmer: A #AsStemmer -+ * @locale: The stemming language as POSIX locale. -+ * -+ * Allows realoading the #AsStemmer with a different language. -+ * Does nothing if the stemmer is already using the selected language. -+ */ -+void -+as_stemmer_reload (AsStemmer *stemmer, const gchar *locale) -+{ -+ as_stemmer_reload_internal (stemmer, locale, FALSE); -+} -+ - /** - * as_stemmer_stem: - * @stemmer: A #AsStemmer --- -2.41.0 - diff --git a/gnu/packages/patches/ark-skip-xar-test.patch b/gnu/packages/patches/ark-skip-xar-test.patch index 525201997b..be891ad139 100644 --- a/gnu/packages/patches/ark-skip-xar-test.patch +++ b/gnu/packages/patches/ark-skip-xar-test.patch @@ -1,44 +1,36 @@ Guix libarchive no support xar. ---- ark-20.04.1.orig/autotests/kerfuffle/loadtest.cpp 2020-12-23 08:46:15.780782601 +0800 -+++ ark-20.04.1/autotests/kerfuffle/loadtest.cpp 2020-12-23 11:13:17.101724042 +0800 -@@ -181,13 +181,6 @@ +--- ark-24.05.2.orig/autotests/kerfuffle/loadtest.cpp 2024-07-08 11:19:30.347366493 +0800 ++++ ark-24.05.2/autotests/kerfuffle/loadtest.cpp 2024-07-08 11:19:47.495641516 +0800 +@@ -125,8 +125,6 @@ qDebug() << "lz4 executable not found in path. Skipping lz4 test."; } -- QTest::newRow("xar archive") -- << QFINDTESTDATA("data/simplearchive.xar") -- << QStringLiteral("simplearchive") -- << true << false << false << false << false << 0 << Archive::Unencrypted -- << QStringLiteral("simplearchive") -- << QString(); -- - QTest::newRow("mimetype child of application/zip") - << QFINDTESTDATA("data/test.odt") - << QStringLiteral("test") ---- ark-20.04.1.orig/autotests/kerfuffle/extracttest.cpp 2020-12-23 08:46:15.780782601 +0800 -+++ ark-20.04.1/autotests/kerfuffle/extracttest.cpp 2020-12-23 11:14:02.801809620 +0800 -@@ -350,23 +350,6 @@ +- QTest::newRow("xar archive") << QFINDTESTDATA("data/simplearchive.xar") << QStringLiteral("simplearchive") << true << false << false << false << false << 0 +- << Archive::Unencrypted << 6 << QStringLiteral("simplearchive") << QString(); + + QTest::newRow("mimetype child of application/zip") << QFINDTESTDATA("data/test.odt") << QStringLiteral("test") << false << true << false << false << false + << 0 << Archive::Unencrypted << 17 << QStringLiteral("test") << QString(); + + +--- ark-24.05.2.orig/autotests/kerfuffle/extracttest.cpp 2024-07-08 11:21:25.849219202 +0800 ++++ ark-24.05.2/autotests/kerfuffle/extracttest.cpp 2024-07-08 11:22:01.413789814 +0800 +@@ -329,18 +329,5 @@ qDebug() << "lz4 executable not found in path. Skipping lz4 test."; } - archivePath = QFINDTESTDATA("data/simplearchive.xar"); -- QTest::newRow("extract selected entries from a xar archive without path") -- << archivePath -- << QVector<Archive::Entry*> { -- new Archive::Entry(this, QStringLiteral("dir1/file11.txt"), QString()), -- new Archive::Entry(this, QStringLiteral("file4.txt"), QString()) -- } -- << optionsNoPaths -- << 2; +- setupRow("extract selected entries from a xar archive without path", +- archivePath, +- QList<Archive::Entry *>{ +- new Archive::Entry(this, QStringLiteral("dir1/file11.txt"), QString()), +- new Archive::Entry(this, QStringLiteral("file4.txt"), QString()), +- }, +- optionsNoPaths, +- 2); - - archivePath = QFINDTESTDATA("data/simplearchive.xar"); -- QTest::newRow("extract all entries from a xar archive with path") -- << archivePath -- << QVector<Archive::Entry*>() -- << optionsPreservePaths -- << 6; +- setupRow("extract all entries from a xar archive with path", archivePath, QList<Archive::Entry *>(), optionsPreservePaths, 6); - archivePath = QFINDTESTDATA("data/hello-1.0-x86_64.AppImage"); - QTest::newRow("extract all entries from an AppImage with path") - << archivePath + setupRow("extract all entries from an AppImage with path", archivePath, QList<Archive::Entry *>(), optionsPreservePaths, 7); diff --git a/gnu/packages/patches/capstone-fix-python-constants.patch b/gnu/packages/patches/capstone-fix-python-constants.patch new file mode 100644 index 0000000000..75100c6652 --- /dev/null +++ b/gnu/packages/patches/capstone-fix-python-constants.patch @@ -0,0 +1,84 @@ +Backport upstream patch fixing various constants in the Python bindings. + +Taken from: https://github.com/capstone-engine/capstone/commit/f180e176de3efb060db62820ff981d0291ea8525 + +diff --git a/bindings/python/capstone/__init__.py b/bindings/python/capstone/__init__.py +index bda2fdb6..52353c28 100755 +--- a/bindings/python/capstone/__init__.py ++++ b/bindings/python/capstone/__init__.py +@@ -113,7 +113,6 @@ __all__ = [ + 'CS_OPT_SYNTAX_NOREGNAME', + 'CS_OPT_SYNTAX_MASM', + 'CS_OPT_SYNTAX_MOTOROLA', +- 'CS_OPT_SYNTAX_CS_REG_ALIAS', + + 'CS_OPT_DETAIL', + 'CS_OPT_MODE', +@@ -152,19 +151,6 @@ __all__ = [ + 'CS_OP_REG', + 'CS_OP_IMM', + 'CS_OP_FP', +- 'CS_OP_PRED', +- 'CS_OP_RESERVED_5', +- 'CS_OP_RESERVED_6', +- 'CS_OP_RESERVED_7', +- 'CS_OP_RESERVED_8', +- 'CS_OP_RESERVED_9', +- 'CS_OP_RESERVED_10', +- 'CS_OP_RESERVED_11', +- 'CS_OP_RESERVED_12', +- 'CS_OP_RESERVED_13', +- 'CS_OP_RESERVED_14', +- 'CS_OP_RESERVED_15', +- 'CS_OP_SPECIAL', + 'CS_OP_MEM', + + 'CS_GRP_INVALID', +@@ -298,26 +284,13 @@ CS_OPT_NO_BRANCH_OFFSET = 9 # ARM, prints branch immediates without offset. + + # Capstone option value + CS_OPT_OFF = 0 # Turn OFF an option - default option of CS_OPT_DETAIL +-CS_OPT_ON = 1 << 0 # Turn ON an option (CS_OPT_DETAIL) ++CS_OPT_ON = 3 # Turn ON an option (CS_OPT_DETAIL) + + # Common instruction operand types - to be consistent across all architectures. + CS_OP_INVALID = 0 # uninitialized/invalid operand. + CS_OP_REG = 1 # Register operand. + CS_OP_IMM = 2 # Immediate operand. + CS_OP_FP = 3 # Floating-Point operand. +-CS_OP_PRED = 4 # Predicate operand. +-CS_OP_RESERVED_5 = 5 +-CS_OP_RESERVED_6 = 6 +-CS_OP_RESERVED_7 = 7 +-CS_OP_RESERVED_8 = 8 +-CS_OP_RESERVED_9 = 9 +-CS_OP_RESERVED_10 = 10 +-CS_OP_RESERVED_11 = 11 +-CS_OP_RESERVED_12 = 12 +-CS_OP_RESERVED_13 = 13 +-CS_OP_RESERVED_14 = 14 +-CS_OP_RESERVED_15 = 15 +-CS_OP_SPECIAL = 0x10 # Special operands from archs + CS_OP_MEM = 0x80 # Memory operand. Can be ORed with another operand type. + + # Common instruction groups - to be consistent across all architectures. +@@ -336,13 +309,12 @@ CS_AC_READ = (1 << 0) # Operand that is read from. + CS_AC_WRITE = (1 << 1) # Operand that is written to. + + # Capstone syntax value +-CS_OPT_SYNTAX_DEFAULT = 1 << 1 # Default assembly syntax of all platforms (CS_OPT_SYNTAX) +-CS_OPT_SYNTAX_INTEL = 1 << 2 # Intel X86 asm syntax - default syntax on X86 (CS_OPT_SYNTAX, CS_ARCH_X86) +-CS_OPT_SYNTAX_ATT = 1 << 3 # ATT asm syntax (CS_OPT_SYNTAX, CS_ARCH_X86) +-CS_OPT_SYNTAX_NOREGNAME = 1 << 4 # Asm syntax prints register name with only number - (CS_OPT_SYNTAX, CS_ARCH_PPC, CS_ARCH_ARM) +-CS_OPT_SYNTAX_MASM = 1 << 5 # MASM syntax (CS_OPT_SYNTAX, CS_ARCH_X86) +-CS_OPT_SYNTAX_MOTOROLA = 1 << 6 # MOS65XX use $ as hex prefix +-CS_OPT_SYNTAX_CS_REG_ALIAS = 1 << 7 # Prints common register alias which are not defined in LLVM (ARM: r9 = sb etc.) ++CS_OPT_SYNTAX_DEFAULT = 0 # Default assembly syntax of all platforms (CS_OPT_SYNTAX) ++CS_OPT_SYNTAX_INTEL = 1 # Intel X86 asm syntax - default syntax on X86 (CS_OPT_SYNTAX, CS_ARCH_X86) ++CS_OPT_SYNTAX_ATT = 2 # ATT asm syntax (CS_OPT_SYNTAX, CS_ARCH_X86) ++CS_OPT_SYNTAX_NOREGNAME = 3 # Asm syntax prints register name with only number - (CS_OPT_SYNTAX, CS_ARCH_PPC, CS_ARCH_ARM) ++CS_OPT_SYNTAX_MASM = 4 # MASM syntax (CS_OPT_SYNTAX, CS_ARCH_X86) ++CS_OPT_SYNTAX_MOTOROLA = 5 # MOS65XX use $ as hex prefix + + # Capstone error type + CS_ERR_OK = 0 # No error: everything was fine diff --git a/gnu/packages/patches/chez-scheme-backport-signal.patch b/gnu/packages/patches/chez-scheme-backport-signal.patch new file mode 100644 index 0000000000..1fee32b167 --- /dev/null +++ b/gnu/packages/patches/chez-scheme-backport-signal.patch @@ -0,0 +1,87 @@ +From e416651d8b53fa2eca6edde764a9131d128cd166 Mon Sep 17 00:00:00 2001 +From: Matthew Flatt <mflatt@racket-lang.org> +Date: Sat, 2 Mar 2024 07:18:41 -0700 +Subject: [PATCH] constrain signal delivery to Scheme to the main thread (#813) + +The intent is to avoid crashes when a signal gets delimited to a +thread that might not even be a Scheme thread. Also, we don't try to +queue the event directly in the main thread's context, because then +we'd need more of a lock (while signal handling is otherwise an +implicit lock). + +(cherry picked from commit fc081fc447a786dd53286e5d7314b7217631cb68) +--- + +Notes: + This should fix intermittent test failures experienced by Guix: + see <https://github.com/cisco/ChezScheme/issues/809>. + + c/globals.h | 1 + + c/schsig.c | 10 ++++++++++ + c/thread.c | 1 + + csug/system.stex | 2 ++ + 4 files changed, 14 insertions(+) + +diff --git a/c/globals.h b/c/globals.h +index d2a08299..eb2965c5 100644 +--- a/c/globals.h ++++ b/c/globals.h +@@ -49,6 +49,7 @@ EXTERN int S_num_preserve_ownership_threads; + # ifdef IMPLICIT_ATOMIC_AS_EXPLICIT + EXTERN s_thread_mutex_t S_implicit_mutex; + # endif ++EXTERN s_thread_t S_main_thread_id; + #endif + + /* segment.c */ +diff --git a/c/schsig.c b/c/schsig.c +index a89ab62a..04677730 100644 +--- a/c/schsig.c ++++ b/c/schsig.c +@@ -666,6 +666,16 @@ ptr S_dequeue_scheme_signals(ptr tc) { + static void forward_signal_to_scheme(INT sig) { + ptr tc = get_thread_context(); + ++#ifdef PTHREADS ++ /* deliver signals to the main thread, only; depending ++ on the threads that are running, `tc` might even be NULL */ ++ if (tc != TO_PTR(&S_G.thread_context)) { ++ pthread_kill(S_main_thread_id, sig); ++ RESET_SIGNAL ++ return; ++ } ++#endif ++ + if (enqueue_scheme_signal(tc, sig)) { + SIGNALINTERRUPTPENDING(tc) = Strue; + SOMETHINGPENDING(tc) = Strue; +diff --git a/c/thread.c b/c/thread.c +index 9a341b22..f130f44d 100644 +--- a/c/thread.c ++++ b/c/thread.c +@@ -40,6 +40,7 @@ void S_thread_init(void) { + s_thread_cond_init(&S_terminated_cond); + S_alloc_mutex.owner = 0; + S_alloc_mutex.count = 0; ++ S_main_thread_id = s_thread_self(); + + # ifdef IMPLICIT_ATOMIC_AS_EXPLICIT + s_thread_mutex_init(&S_implicit_mutex); +diff --git a/csug/system.stex b/csug/system.stex +index d4f2bcbb..bb89f419 100644 +--- a/csug/system.stex ++++ b/csug/system.stex +@@ -547,6 +547,8 @@ After a signal handler for a given signal has been registered, receipt + of the specified signal results in a call to the handler. + The handler is passed the signal number, allowing the same handler to + be used for different signals while differentiating among them. ++In a threaded version of the system, signals are always delivered to ++the main thread. + + Signals handled in this fashion are treated like keyboard interrupts in + that the handler is not called immediately when the signal is delivered + +base-commit: 253230f7dfbb4fe777277d6bbf93f39f9567f086 +-- +2.41.0 + diff --git a/gnu/packages/patches/clasp-hide-event-ids.patch b/gnu/packages/patches/clasp-hide-event-ids.patch new file mode 100644 index 0000000000..9587f9ff3f --- /dev/null +++ b/gnu/packages/patches/clasp-hide-event-ids.patch @@ -0,0 +1,41 @@ +From a4c4e4f3c410834c3e56f644841f5bcbb084225c Mon Sep 17 00:00:00 2001 +From: Liliana Marie Prikler <liliana.prikler@ist.tugraz.at> +Date: Fri, 28 Jun 2024 11:15:16 +0200 +Subject: [PATCH] clasp: Hide Event_t<T>::id_s. + +This patch helps build clingo with non-local clasp while keeping the +event system working as intended. +--- + clasp/util/misc_types.h | 2 ++ + src/CMakeLists.txt | 2 +- + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/clasp/util/misc_types.h b/clasp/util/misc_types.h +index 3677873..09c2075 100644 +--- a/clasp/util/misc_types.h ++++ b/clasp/util/misc_types.h +@@ -432,7 +432,9 @@ struct Event_t : Event { + Event_t(Subsystem sys, Verbosity verb) : Event(sys, id_s, verb) {} + static const uint32 id_s; + }; ++#if _BUILDING_CLASP_ + template <class T> const uint32 Event_t<T>::id_s = Event::nextId(); ++#endif + + template <class ToType, class EvType> const ToType* event_cast(const EvType& ev) { return ev.id == ToType::id_s ? static_cast<const ToType*>(&ev) : 0; } + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 8439d12..4f55990 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -123,6 +123,7 @@ source_group("${ide_header}\\mt" FILES ${header_mt}) + endif() + + add_library(libclasp ${header} ${header_util} ${header_cli} ${header_mt} ${src}) ++target_compile_definitions(libclasp PRIVATE _BUILDING_CLASP_) + if (CLASP_BUILD_WITH_THREADS) + target_link_libraries(libclasp PUBLIC Threads::Threads) + target_compile_options(libclasp PRIVATE +-- +2.45.1 + diff --git a/gnu/packages/patches/freeimage-libraw-0.21-compat.patch b/gnu/packages/patches/freeimage-libraw-0.21-compat.patch new file mode 100644 index 0000000000..b7eb7a4035 --- /dev/null +++ b/gnu/packages/patches/freeimage-libraw-0.21-compat.patch @@ -0,0 +1,15 @@ +from https://gitlab.archlinux.org/archlinux/packaging/packages/freeimage/-/blob/69548d01896b32f30937a71220a9133055d84705/freeimage-libraw-0.21.patch + +diff -ru FreeImage.orig/Source/FreeImage/PluginRAW.cpp FreeImage/Source/FreeImage/PluginRAW.cpp +--- FreeImage.orig/Source/FreeImage/PluginRAW.cpp 2022-12-18 21:57:11.447801357 +0100 ++++ FreeImage/Source/FreeImage/PluginRAW.cpp 2022-12-18 21:58:05.103433138 +0100 +@@ -687,7 +687,7 @@ + // -------------------------------------------- + + // (-s [0..N-1]) Select one raw image from input file +- RawProcessor->imgdata.params.shot_select = 0; ++ RawProcessor->imgdata.rawparams.shot_select = 0; + // (-w) Use camera white balance, if possible (otherwise, fallback to auto_wb) + RawProcessor->imgdata.params.use_camera_wb = 1; + // (-M) Use any color matrix from the camera metadata. This option only affects Olympus, Leaf, and Phase One cameras. + diff --git a/gnu/packages/patches/ghc-unique-support-newer-hashable.patch b/gnu/packages/patches/ghc-unique-support-newer-hashable.patch new file mode 100644 index 0000000000..279a00716d --- /dev/null +++ b/gnu/packages/patches/ghc-unique-support-newer-hashable.patch @@ -0,0 +1,110 @@ +From b5e9f017bab8fad05cac47f2ac75841dc37c7f34 Mon Sep 17 00:00:00 2001 +From: Yura Lazarev <Unisay@users.noreply.github.com> +Date: Wed, 14 Sep 2022 07:04:41 +0000 +Subject: [PATCH] Support hashable >=^ 1.4, improve unit tests. + +--- + Unique.cabal | 2 +- + tests/UniqueStrict/RepeatedBy.hs | 4 ++-- + tests/UniqueUnsorted/RemoveDuplicates.hs | 6 +++--- + tests/UniqueUnsorted/RepeatedBy.hs | 8 ++++---- + 4 files changed, 10 insertions(+), 10 deletions(-) + +diff --git a/Unique.cabal b/Unique.cabal +index 1c03188..45dbbed 100644 +--- a/Unique.cabal ++++ b/Unique.cabal +@@ -29,7 +29,7 @@ library + base >=4.0 && < 5, + containers >=0.5.0.0 && <=0.7, + extra >=1.6.2 && <=1.8, +- hashable >= 1.2.6 && <=1.4, ++ hashable >= 1.2.6 && < 1.5, + unordered-containers >= 0.2.8 && <=0.3 + + test-suite HspecTest +diff --git a/tests/UniqueStrict/RepeatedBy.hs b/tests/UniqueStrict/RepeatedBy.hs +index 11eb180..04d8706 100644 +--- a/tests/UniqueStrict/RepeatedBy.hs ++++ b/tests/UniqueStrict/RepeatedBy.hs +@@ -15,7 +15,7 @@ repeatedByTests = + repeatedBy (>100) ( [] :: [Int] ) `shouldBe` [] + + it "repeatedBy: simple test" $ do +- repeatedBy (>2) "This is the test line" `shouldBe` " eist" ++ sort (repeatedBy (>2) "This is the test line") `shouldBe` " eist" + + it "repeatedBy: returns [] when predicate (=< negative) " $ + property $ +@@ -39,7 +39,7 @@ repeatedByTests = + it "repeatedBy: resulted elements should occur only once" $ + property $ + \ x xs -> x > 0 +- ==> all (==1) . map length . group $ repeatedBy (> x) ( xs :: String ) ++ ==> all ((==1) . length) . group $ repeatedBy (> x) ( xs :: String ) + + it "unique: simple test" $ do + unique "foo bar" `shouldBe` " abfr" +diff --git a/tests/UniqueUnsorted/RemoveDuplicates.hs b/tests/UniqueUnsorted/RemoveDuplicates.hs +index 19b4e5f..93861c5 100644 +--- a/tests/UniqueUnsorted/RemoveDuplicates.hs ++++ b/tests/UniqueUnsorted/RemoveDuplicates.hs +@@ -4,7 +4,7 @@ import Test.Hspec + import Test.QuickCheck + + import Data.List.UniqueUnsorted +-import Data.List (group) ++import Data.List (group, sort) + + + removeDuplicatesTests :: SpecWith () +@@ -15,7 +15,7 @@ removeDuplicatesTests = + removeDuplicates ( [] :: [Int] ) `shouldBe` [] + + it "removeDuplicates: simple test" $ do +- removeDuplicates "foo bar" `shouldBe` " abrfo" ++ sort (removeDuplicates "foo bar") `shouldBe` " abfor" + + it "removeDuplicates: multiple execution should return the same result" $ + property $ +@@ -27,4 +27,4 @@ removeDuplicatesTests = + + it "removeDuplicates: elements should occur only once #2" $ + property $ +- \ xs -> all (==1) . map length . group $ removeDuplicates ( xs :: [Integer] ) ++ \ xs -> all ((==1) . length) . group $ removeDuplicates ( xs :: [Integer] ) +diff --git a/tests/UniqueUnsorted/RepeatedBy.hs b/tests/UniqueUnsorted/RepeatedBy.hs +index 54e3930..5550489 100644 +--- a/tests/UniqueUnsorted/RepeatedBy.hs ++++ b/tests/UniqueUnsorted/RepeatedBy.hs +@@ -4,7 +4,7 @@ import Test.Hspec + import Test.QuickCheck + + import Data.List.UniqueUnsorted +-import Data.List (group) ++import Data.List (group, sort) + + + repeatedByTests :: SpecWith () +@@ -15,7 +15,7 @@ repeatedByTests = + repeatedBy (>100) ( [] :: [Int] ) `shouldBe` [] + + it "repeatedBy: simple test" $ do +- repeatedBy (>2) "This is the test line" `shouldBe` " stei" ++ sort (repeatedBy (>2) "This is the test line") `shouldBe` " eist" + + it "repeatedBy: returns [] when predicate (=< negative) " $ + property $ +@@ -29,10 +29,10 @@ repeatedByTests = + it "repeatedBy: resulted elements should occur only once" $ + property $ + \ x xs -> x > 0 +- ==> all (==1) . map length . group $ repeatedBy (> x) ( xs :: String ) ++ ==> all ((==1) . length) . group $ repeatedBy (> x) ( xs :: String ) + + it "unique: simple test" $ do +- unique "foo bar" `shouldBe` " abrf" ++ sort (unique "foo bar") `shouldBe` " abfr" + + it "repeated: simple test" $ do + repeated "foo bar" `shouldBe` "o" diff --git a/gnu/packages/patches/gwenview-kimageannotator.patch b/gnu/packages/patches/gwenview-kimageannotator.patch deleted file mode 100644 index 92b994a0b5..0000000000 --- a/gnu/packages/patches/gwenview-kimageannotator.patch +++ /dev/null @@ -1,29 +0,0 @@ -Submitted By: Douglas R. Reno <renodr at linuxfromscratch dot org> -Date: 2024-02-26 -Initial Package Version: 23.08.5 -Upstream Status: Rejected (Qt6 port is primary now) -Origin: Self -Description: Fixes building Gwenview with recent kImageAnnotator - and kColorPicker versions by adjusting their paths - and FOUND variables so that the correct libraries are - selected. - ---- gwenview-23.08.5.orig/CMakeLists.txt 2024-02-26 15:02:29.702754535 -0600 -+++ gwenview-23.08.5/CMakeLists.txt 2024-02-26 15:09:48.012866877 -0600 -@@ -166,11 +166,11 @@ if(NOT WITHOUT_X11) - endif() - - if (QT_MAJOR_VERSION STREQUAL "5") -- find_package(kImageAnnotator) -- set_package_properties(kImageAnnotator PROPERTIES URL "https://github.com/ksnip/kImageAnnotator" DESCRIPTION "The kImageAnnotator library provides tools to annotate" TYPE REQUIRED) -- if(kImageAnnotator_FOUND) -- set(KIMAGEANNOTATOR_FOUND 1) -- find_package(kColorPicker REQUIRED) -+ find_package(kImageAnnotator-Qt5) -+ set_package_properties(kImageAnnotator-Qt5 PROPERTIES URL "https://github.com/ksnip/kImageAnnotator" DESCRIPTION "The kImageAnnotator library provides tools to annotate" TYPE REQUIRED) -+ if(kImageAnnotator-Qt5_FOUND) -+ set(kImageAnnotator_FOUND 1) -+ find_package(kColorPicker-Qt5 REQUIRED) - if(NOT kImageAnnotator_VERSION VERSION_LESS 0.5.0) - set(KIMAGEANNOTATOR_CAN_LOAD_TRANSLATIONS 1) - endif() diff --git a/gnu/packages/patches/kdiagram-Fix-missing-link-libraries.patch b/gnu/packages/patches/kdiagram-Fix-missing-link-libraries.patch index cdfb608d9b..11116fe51a 100644 --- a/gnu/packages/patches/kdiagram-Fix-missing-link-libraries.patch +++ b/gnu/packages/patches/kdiagram-Fix-missing-link-libraries.patch @@ -16,8 +16,8 @@ index be2a6fc..b13befb 100644 @@ -1,3 +1,3 @@ add_executable(BarsSimple main.cpp) --target_link_libraries(BarsSimple KChart Qt5::Widgets) -+target_link_libraries(BarsSimple KChart Qt5::Widgets Qt5::Svg) +-target_link_libraries(BarsSimple KChart6 Qt::Widgets) ++target_link_libraries(BarsSimple KChart6 Qt::Widgets Qt::Svg) -- 2.21.1 diff --git a/gnu/packages/patches/kwin-unwrap-executable-name-for-dot-desktop-search.patch b/gnu/packages/patches/kwin-unwrap-executable-name-for-dot-desktop-search.patch index 8f67553138..6256ff24e3 100644 --- a/gnu/packages/patches/kwin-unwrap-executable-name-for-dot-desktop-search.patch +++ b/gnu/packages/patches/kwin-unwrap-executable-name-for-dot-desktop-search.patch @@ -14,12 +14,11 @@ new file mode 100644 index 0000000..726065d --- /dev/null +++ b/src/guix_utils.h -@@ -0,0 +1,24 @@ +@@ -0,0 +1,23 @@ +#ifndef GUIX_UTILS_H +#define GUIX_UTILS_H + +// kwin -+#include <kwinglobals.h> + +namespace KWin +{ diff --git a/gnu/packages/patches/libksysguard-qdiriterator-follow-symlinks.patch b/gnu/packages/patches/libksysguard-qdiriterator-follow-symlinks.patch deleted file mode 100644 index ec4a34037d..0000000000 --- a/gnu/packages/patches/libksysguard-qdiriterator-follow-symlinks.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 46164a50de4102d02ae9d1d480acdd4b12303db8 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel <ttuegel@gmail.com> -Date: Wed, 14 Oct 2015 07:07:22 -0500 -Subject: [PATCH] qdiriterator follow symlinks - ---- - processui/scripting.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/processui/scripting.cpp b/processui/scripting.cpp -index efed8ff..841761a 100644 ---- a/processui/scripting.cpp -+++ b/processui/scripting.cpp -@@ -293,7 +293,7 @@ void Scripting::loadContextMenu() - const QStringList dirs = - QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("ksysguard/scripts/"), QStandardPaths::LocateDirectory); - for (const QString &dir : dirs) { -- QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories); -+ QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); - while (it.hasNext()) { - scripts.append(it.next()); - } --- -2.5.2 diff --git a/gnu/packages/patches/mingw-w64-6.0.0-gcc.patch b/gnu/packages/patches/mingw-w64-6.0.0-gcc.patch deleted file mode 100644 index 036cf79f91..0000000000 --- a/gnu/packages/patches/mingw-w64-6.0.0-gcc.patch +++ /dev/null @@ -1,65 +0,0 @@ -This patch includes - - * mingw-w64-headers/include/winnt.h: compile fixes for1 gcc-4.9.3 - * mingw-w64-headers/crt/math.h: Likewise - * mingw-w64-headers/crt/float.h (FLT_EPSILON,DBL_EPSILON,LDBL_EPSILON): Add - symbols. - * mingw-w64-headers/crt/stat.h (S_ISLNK,S_ISSOCK,S_ISUID,S_ISGID,S_ISLINK): - Add symbols. - (lstat): Add function. - * mingw-w64-headers/crt/_mingw_stat64.h: Likewise - * mingw-w64-headers/crt/stdlib.h (realpath): Add function. - -Needed for building with gcc-4.9.3 and using with cross-libtool-2.4.6. - -Upstream status: not yet presented upstream. - -diff --git a/mingw-w64-headers/crt/float.h b/mingw-w64-headers/crt/float.h -index 5874f4e..bdf4ead 100644 ---- a/mingw-w64-headers/crt/float.h -+++ b/mingw-w64-headers/crt/float.h -@@ -22,6 +22,15 @@ - #if (__GNUC__ < 4) - #error Corrupt install of gcc-s internal headers, or search order was changed. - #else -+ -+ /* From gcc-4.9.3 float.h. */ -+ #undef FLT_EPSILON -+ #undef DBL_EPSILON -+ #undef LDBL_EPSILON -+ #define FLT_EPSILON __FLT_EPSILON__ -+ #define DBL_EPSILON __DBL_EPSILON__ -+ #define LDBL_EPSILON __LDBL_EPSILON__ -+ - /* #include_next <float_ginclude.h> */ - - /* Number of decimal digits, q, such that any floating-point number with q -diff --git a/mingw-w64-headers/crt/math.h b/mingw-w64-headers/crt/math.h -index 1e970f4..99a332f 100644 ---- a/mingw-w64-headers/crt/math.h -+++ b/mingw-w64-headers/crt/math.h -@@ -216,6 +216,7 @@ extern "C" { - #endif - } - -+#if 0 - __CRT_INLINE long double __cdecl fabsl (long double x) - { - #ifdef __arm__ -@@ -226,6 +227,7 @@ extern "C" { - return res; - #endif - } -+#endif - - __CRT_INLINE double __cdecl fabs (double x) - { -@@ -905,7 +907,7 @@ __mingw_choose_expr ( \ - /* 7.12.7.3 */ - extern double __cdecl hypot (double, double) __MINGW_ATTRIB_DEPRECATED_MSVC2005; /* in libmoldname.a */ - extern float __cdecl hypotf (float x, float y); --#ifndef __CRT__NO_INLINE -+#if 0 //ndef __CRT__NO_INLINE - __CRT_INLINE float __cdecl hypotf (float x, float y) { return (float) hypot ((double)x, (double)y);} - #endif - extern long double __cdecl hypotl (long double, long double); diff --git a/gnu/packages/patches/mingw-w64-dlltool-temp-prefix.patch b/gnu/packages/patches/mingw-w64-dlltool-temp-prefix.patch deleted file mode 100644 index 432cafc162..0000000000 --- a/gnu/packages/patches/mingw-w64-dlltool-temp-prefix.patch +++ /dev/null @@ -1,26 +0,0 @@ -This following patch was originally found at the debian mingw-w64 team's -mingw-w64 repo located here: -https://salsa.debian.org/mingw-w64-team/mingw-w64.git - -Invoke the following in the aforementioned repo to see the original patch: - - $ git show 4974e2c:debian/patches/dlltool-temp-prefix.patch - -Description: Specify dlltool's temp prefix -Author: Stephen Kitt <steve@sk2.org> - -By default dlltool uses its pid for the object files it generates. -Enforcing its temp prefix allows the files it generates to be -reproducible. - ---- a/mingw-w64-crt/Makefile.am -+++ b/mingw-w64-crt/Makefile.am -@@ -36,7 +36,7 @@ - DTDEF32=$(GENLIB) $(DLLTOOLFLAGS32) $(AM_DLLTOOLFLAGS) - DTDEF64=$(GENLIB) $(DLLTOOLFLAGS64) $(AM_DLLTOOLFLAGS) - else -- AM_DLLTOOLFLAGS=-k --as=$(AS) --output-lib $@ -+ AM_DLLTOOLFLAGS=-k --as=$(AS) --output-lib $@ --temp-prefix $$(basename $@ .a) - DLLTOOLFLAGSARM32=-m arm - DLLTOOLFLAGSARM64=-m arm64 - DLLTOOLFLAGS32=--as-flags=--32 -m i386 diff --git a/gnu/packages/patches/mingw-w64-reproducible-gendef.patch b/gnu/packages/patches/mingw-w64-reproducible-gendef.patch deleted file mode 100644 index 8dbea54ce9..0000000000 --- a/gnu/packages/patches/mingw-w64-reproducible-gendef.patch +++ /dev/null @@ -1,33 +0,0 @@ -This following patch was originally found at the debian mingw-w64 team's -mingw-w64 repo located here: -https://salsa.debian.org/mingw-w64-team/mingw-w64.git - -Invoke the following in the aforementioned repo to see the original patch: - - $ git show 9a33f50:debian/patches/reproducible-build.patch - -Description: Drop __DATE__ from gendef and genlib -Author: Stephen Kitt <skitt@debian.org> - -This allows gendef and genlib to be built reproducibly. - ---- a/mingw-w64-tools/gendef/src/gendef.c -+++ b/mingw-w64-tools/gendef/src/gendef.c -@@ -196,7 +196,6 @@ - " By default, the output files are named after their DLL counterparts\n" - " gendef MYDLL.DLL Produces MYDLL.def\n" - " gendef - MYDLL.DLL Prints the exports to stdout\n"); -- fprintf (stderr, "\nBuilt on %s\n", __DATE__); - fprintf (stderr, "\nReport bugs to <mingw-w64-public@lists.sourceforge.net>\n"); - exit (0); - } ---- a/mingw-w64-tools/genlib/src/genlib.c -+++ b/mingw-w64-tools/genlib/src/genlib.c -@@ -123,7 +123,6 @@ - "Usage example:\n" - " By default, the output file is named after the DLL counterpart\n" - " genlib mydef.def Produces libmydll.a\n" --"\nBuilt on " __DATE__ "\n" - "\nReport bugs to <martellmalone@gmail.com>\n" - ; - diff --git a/gnu/packages/patches/python-angr-addition-type-error.patch b/gnu/packages/patches/python-angr-addition-type-error.patch new file mode 100644 index 0000000000..7301d8b505 --- /dev/null +++ b/gnu/packages/patches/python-angr-addition-type-error.patch @@ -0,0 +1,18 @@ +This fixes failures of the test_ln_gcc_O2 and other related tests +in the angr test suite. The patch has been proposed upstream. + +Taken form: https://github.com/angr/angr/pull/4443 + +diff --git a/angr/analyses/reassembler.py b/angr/analyses/reassembler.py +index 7a2399a60..b09b3a8cb 100644 +--- a/angr/analyses/reassembler.py ++++ b/angr/analyses/reassembler.py +@@ -730,7 +730,7 @@ class Instruction: + elif operand.type == capstone.CS_OP_MEM: + operand_offsets.append(capstone_instr.disp_offset) + else: +- operand_offsets.append(None) ++ operand_offsets.append(0) + + if self.addr is not None: + self._initialize(capstone_instr.operands, operand_offsets) diff --git a/gnu/packages/patches/python-angr-check-exec-deps.patch b/gnu/packages/patches/python-angr-check-exec-deps.patch new file mode 100644 index 0000000000..438f8ef183 --- /dev/null +++ b/gnu/packages/patches/python-angr-check-exec-deps.patch @@ -0,0 +1,93 @@ +The angr test suite performs analysis on several pre-compiled binaries +to ensure its binary analysis capabilities are working as intended. +Some of these binaries are also executed as part of the test suite to +test if the simulation engine provided by angr results in the same +output as native execution of the binary. + +For Guix, this files as the glibc shared objects cannot be found. +Additionally, we don't really want to execute pre-compiled binaries +on Guix, hence we disable those tests. + +diff --git a/tests/test_ctype_locale.py b/tests/test_ctype_locale.py +index 08cb89836..2b9233558 100644 +--- a/tests/test_ctype_locale.py ++++ b/tests/test_ctype_locale.py +@@ -14,7 +14,7 @@ test_location = os.path.dirname(os.path.abspath(__file__)) + + + class TestCtypeLocale(unittest.TestCase): +- @skip_if_not_linux ++ @unittest.skip("test executes pre-compiled binaries") + def test_ctype_b_loc(self): + """ + test_ctype_locale.test_ctype_b_loc +@@ -60,7 +60,7 @@ class TestCtypeLocale(unittest.TestCase): + output = subprocess.check_output(bin_path, shell=True) + assert result == output + +- @skip_if_not_linux ++ @unittest.skip("test executes pre-compiled binaries") + def test_ctype_tolower_loc(self): + """ + test_ctype_locale.test_ctype_tolower_loc +@@ -109,7 +109,7 @@ class TestCtypeLocale(unittest.TestCase): + output = subprocess.check_output(bin_path, shell=True) + assert result == output + +- @skip_if_not_linux ++ @unittest.skip("test executes pre-compiled binaries") + def test_ctype_toupper_loc(self): + """ + test_ctype_locale.test_ctype_toupper_loc +diff --git a/tests/test_signed_div.py b/tests/test_signed_div.py +index 59cb9b8d1..994ed9c65 100644 +--- a/tests/test_signed_div.py ++++ b/tests/test_signed_div.py +@@ -1,6 +1,7 @@ + import angr + import subprocess + import sys ++import pytest + + import logging + +@@ -13,7 +14,7 @@ import os + test_location = os.path.dirname(os.path.realpath(__file__)) + + +-@skipUnless(sys.platform.startswith("linux"), "linux only") ++@pytest.mark.skip(reason="test executes pre-compiled binaries") + def test_signed_div(): + test_bin = os.path.join(test_location, "..", "..", "binaries", "tests", "x86_64", "test_signed_div") + b = angr.Project(test_bin, auto_load_libs=False) +diff --git a/tests/test_sscanf.py b/tests/test_sscanf.py +index 29d2c8403..ea799b310 100644 +--- a/tests/test_sscanf.py ++++ b/tests/test_sscanf.py +@@ -1,3 +1,4 @@ ++import pytest + import angr + import subprocess + import sys +@@ -14,7 +15,7 @@ test_location = os.path.dirname(os.path.realpath(__file__)) + + + class TestSscanf(unittest.TestCase): +- @unittest.skipUnless(sys.platform.startswith("linux"), "linux only") ++ @unittest.skip("test executes pre-compiled binaries") + def test_sscanf(self): + test_bin = os.path.join(test_location, "..", "..", "binaries", "tests", "x86_64", "sscanf_test") + b = angr.Project(test_bin, auto_load_libs=False) +diff --git a/tests/test_strtol.py b/tests/test_strtol.py +index 6c29cab22..f36181407 100644 +--- a/tests/test_strtol.py ++++ b/tests/test_strtol.py +@@ -11,7 +11,7 @@ class TestStrtol(unittest.TestCase): + # pylint: disable=no-self-use + + @slow_test +- @unittest.skipUnless(sys.platform.startswith("linux"), "linux-only") ++ @unittest.skip("test executes pre-compiled binaries") + def test_strtol(self, threads=None): + test_bin = os.path.join(bin_location, "tests", "x86_64", "strtol_test") + # disabling auto_load_libs increases the execution time of the test case. diff --git a/gnu/packages/patches/python-pysmt-fix-pow-return-type.patch b/gnu/packages/patches/python-pysmt-fix-pow-return-type.patch new file mode 100644 index 0000000000..0ec2d41b3c --- /dev/null +++ b/gnu/packages/patches/python-pysmt-fix-pow-return-type.patch @@ -0,0 +1,258 @@ +Backport of an upstream patch which fixes a test failure with our +packaged version of the Z3 SMT solver. + +Taken from: https://github.com/pysmt/pysmt/commit/f522e8cd8f3e75ff85f5eae29b427e18a6701859 + +diff --git a/pysmt/formula.py b/pysmt/formula.py +index ea4b46c..6cb9cbf 100644 +--- a/pysmt/formula.py ++++ b/pysmt/formula.py +@@ -252,11 +252,7 @@ class FormulaManager(object): + + if base.is_constant(): + val = base.constant_value() ** exponent.constant_value() +- if base.is_constant(types.REAL): +- return self.Real(val) +- else: +- assert base.is_constant(types.INT) +- return self.Int(val) ++ return self.Real(val) + return self.create_node(node_type=op.POW, args=(base, exponent)) + + def Div(self, left, right): +diff --git a/pysmt/logics.py b/pysmt/logics.py +index ef88dd6..9dc45b1 100644 +--- a/pysmt/logics.py ++++ b/pysmt/logics.py +@@ -495,6 +495,12 @@ QF_NRA = Logic(name="QF_NRA", + real_arithmetic=True, + linear=False) + ++QF_NIRA = Logic(name="QF_NIRA", ++ description="""Quantifier-free integer and real arithmetic.""", ++ quantifier_free=True, ++ integer_arithmetic=True, ++ real_arithmetic=True, ++ linear=False) + + QF_RDL = Logic(name="QF_RDL", + description=\ +@@ -619,41 +625,41 @@ QF_AUFBVLIRA = Logic(name="QF_AUFBVLIRA", + AUTO = Logic(name="Auto", + description="Special logic used to indicate that the logic to be used depends on the formula.") + +-SMTLIB2_LOGICS = frozenset([ AUFLIA, +- AUFLIRA, +- AUFNIRA, +- ALIA, +- LRA, +- LIA, +- NIA, +- NRA, +- UFLRA, +- UFNIA, +- UFLIRA, +- QF_ABV, +- QF_AUFBV, +- QF_AUFLIA, +- QF_ALIA, +- QF_AX, +- QF_BV, +- QF_IDL, +- QF_LIA, +- QF_LRA, +- QF_NIA, +- QF_NRA, +- QF_RDL, +- QF_UF, +- QF_UFBV , +- QF_UFIDL, +- QF_UFLIA, +- QF_UFLRA, +- QF_UFNRA, +- QF_UFNIA, +- QF_UFLIRA, +- QF_SLIA +- ]) +- +-LOGICS = SMTLIB2_LOGICS | frozenset([ QF_BOOL, BOOL, QF_AUFBVLIRA]) ++SMTLIB2_LOGICS = frozenset([AUFLIA, ++ AUFLIRA, ++ AUFNIRA, ++ ALIA, ++ LRA, ++ LIA, ++ NIA, ++ NRA, ++ UFLRA, ++ UFNIA, ++ UFLIRA, ++ QF_ABV, ++ QF_AUFBV, ++ QF_AUFLIA, ++ QF_ALIA, ++ QF_AX, ++ QF_BV, ++ QF_IDL, ++ QF_LIA, ++ QF_LRA, ++ QF_NIA, ++ QF_NRA, ++ QF_RDL, ++ QF_UF, ++ QF_UFBV, ++ QF_UFIDL, ++ QF_UFLIA, ++ QF_UFLRA, ++ QF_UFNRA, ++ QF_UFNIA, ++ QF_UFLIRA, ++ QF_SLIA ++ ]) ++ ++LOGICS = SMTLIB2_LOGICS | frozenset([QF_BOOL, BOOL, QF_AUFBVLIRA, QF_NIRA]) + + QF_LOGICS = frozenset(_l for _l in LOGICS if _l.quantifier_free) + +@@ -668,8 +674,8 @@ PYSMT_LOGICS = frozenset([QF_BOOL, QF_IDL, QF_LIA, QF_LRA, QF_RDL, QF_UF, QF_UFI + QF_BV, QF_UFBV, + QF_ABV, QF_AUFBV, QF_AUFLIA, QF_ALIA, QF_AX, + QF_AUFBVLIRA, +- QF_NRA, QF_NIA, UFBV, BV, +- ]) ++ QF_NRA, QF_NIA, QF_NIRA, UFBV, BV, ++ ]) + + # PySMT Logics includes additional features: + # - constant arrays: QF_AUFBV becomes QF_AUFBV* +@@ -697,7 +703,6 @@ for l in PYSMT_LOGICS: + ext_logics.add(nl) + + +- + LOGICS = LOGICS | frozenset(ext_logics) + PYSMT_LOGICS = PYSMT_LOGICS | frozenset(ext_logics) + +diff --git a/pysmt/solvers/z3.py b/pysmt/solvers/z3.py +index 3fb42b9..210b771 100644 +--- a/pysmt/solvers/z3.py ++++ b/pysmt/solvers/z3.py +@@ -595,6 +595,8 @@ class Z3Converter(Converter, DagWalker): + None, None, + 0, None, + expr.ast) ++ print("Z3: SMTLIB") ++ print(s) + stream_in = StringIO(s) + r = parser.get_script(stream_in).get_last_formula(self.mgr) + key = (askey(expr), None) +diff --git a/pysmt/test/examples.py b/pysmt/test/examples.py +index 73455ee..b653185 100644 +--- a/pysmt/test/examples.py ++++ b/pysmt/test/examples.py +@@ -898,12 +898,12 @@ def get_full_example_formulae(environment=None): + logic=pysmt.logics.QF_NRA + ), + +- Example(hr="((p ^ 2) = 0)", +- expr=Equals(Pow(p, Int(2)), Int(0)), ++ Example(hr="((p ^ 2) = 0.0)", ++ expr=Equals(Pow(p, Int(2)), Real(0)), + is_valid=False, + is_sat=True, +- logic=pysmt.logics.QF_NIA +- ), ++ logic=pysmt.logics.QF_NIRA ++ ), + + Example(hr="((r ^ 2.0) = 0.0)", + expr=Equals(Pow(r, Real(2)), Real(0)), +diff --git a/pysmt/test/test_back.py b/pysmt/test/test_back.py +index bceb45b..7a0ad63 100644 +--- a/pysmt/test/test_back.py ++++ b/pysmt/test/test_back.py +@@ -55,10 +55,10 @@ class TestBasic(TestCase): + res = msat.converter.back(term) + self.assertFalse(f == res) + +- def do_back(self, solver_name, z3_string_buffer=False): ++ def do_back(self, solver_name, via_smtlib=False): + for formula, _, _, logic in get_example_formulae(): + if logic.quantifier_free: +- if logic.theory.custom_type and z3_string_buffer: ++ if logic.theory.custom_type and via_smtlib: + # Printing of declare-sort from Z3 is not conformant + # with the SMT-LIB. We might consider extending our + # parser. +@@ -67,7 +67,7 @@ class TestBasic(TestCase): + s = Solver(name=solver_name, logic=logic) + term = s.converter.convert(formula) + if solver_name == "z3": +- if z3_string_buffer: ++ if via_smtlib: + res = s.converter.back_via_smtlib(term) + else: + res = s.converter.back(term) +@@ -84,8 +84,8 @@ class TestBasic(TestCase): + + @skipIfSolverNotAvailable("z3") + def test_z3_back_formulae(self): +- self.do_back("z3", z3_string_buffer=False) +- self.do_back("z3", z3_string_buffer=True) ++ self.do_back("z3", via_smtlib=True) ++ self.do_back("z3", via_smtlib=False) + + + if __name__ == '__main__': +diff --git a/pysmt/type_checker.py b/pysmt/type_checker.py +index b700fcf..7ce05aa 100644 +--- a/pysmt/type_checker.py ++++ b/pysmt/type_checker.py +@@ -33,6 +33,8 @@ class SimpleTypeChecker(walkers.DagWalker): + + def __init__(self, env=None): + walkers.DagWalker.__init__(self, env=env) ++ # Return None if the type cannot be computed rather than ++ # raising an exception. + self.be_nice = False + + def _get_key(self, formula, **kwargs): +@@ -42,7 +44,7 @@ class SimpleTypeChecker(walkers.DagWalker): + """ Returns the pysmt.types type of the formula """ + res = self.walk(formula) + if not self.be_nice and res is None: +- raise PysmtTypeError("The formula '%s' is not well-formed" \ ++ raise PysmtTypeError("The formula '%s' is not well-formed" + % str(formula)) + return res + +@@ -114,7 +116,7 @@ class SimpleTypeChecker(walkers.DagWalker): + + def walk_bv_comp(self, formula, args, **kwargs): + # We check that all children are BV and the same size +- a,b = args ++ a, b = args + if a != b or (not a.is_bv_type()): + return None + return BVType(1) +@@ -187,7 +189,7 @@ class SimpleTypeChecker(walkers.DagWalker): + if args[0].is_bool_type(): + raise PysmtTypeError("The formula '%s' is not well-formed." + "Equality operator is not supported for Boolean" +- " terms. Use Iff instead." \ ++ " terms. Use Iff instead." + % str(formula)) + elif args[0].is_bv_type(): + return self.walk_bv_to_bool(formula, args) +@@ -324,10 +326,7 @@ class SimpleTypeChecker(walkers.DagWalker): + def walk_pow(self, formula, args, **kwargs): + if args[0] != args[1]: + return None +- # Exponent must be positive for INT +- if args[0].is_int_type() and formula.arg(1).constant_value() < 0 : +- return None +- return args[0] ++ return REAL + + # EOC SimpleTypeChecker + diff --git a/gnu/packages/patches/python-pysmt-fix-smtlib-serialization-test.patch b/gnu/packages/patches/python-pysmt-fix-smtlib-serialization-test.patch new file mode 100644 index 0000000000..eee555f807 --- /dev/null +++ b/gnu/packages/patches/python-pysmt-fix-smtlib-serialization-test.patch @@ -0,0 +1,86 @@ +Backport of an upstream patch fixing a test suite failure. + +Taken from: https://github.com/pysmt/pysmt/commit/a246669a487aff69f5da34570ef867841d18508a + +diff --git a/pysmt/test/smtlib/test_parser_examples.py b/pysmt/test/smtlib/test_parser_examples.py +index cca4194..c0852be 100644 +--- a/pysmt/test/smtlib/test_parser_examples.py ++++ b/pysmt/test/smtlib/test_parser_examples.py +@@ -29,6 +29,7 @@ from pysmt.shortcuts import Iff + from pysmt.shortcuts import read_smtlib, write_smtlib, get_env + from pysmt.exceptions import PysmtSyntaxError + ++ + class TestSMTParseExamples(TestCase): + + def test_parse_examples(self): +@@ -41,7 +42,6 @@ class TestSMTParseExamples(TestCase): + buf = StringIO() + script_out = smtlibscript_from_formula(f_out) + script_out.serialize(outstream=buf) +- #print(buf) + + buf.seek(0) + parser = SmtLibParser() +@@ -49,7 +49,6 @@ class TestSMTParseExamples(TestCase): + f_in = script_in.get_last_formula() + self.assertEqual(f_in.simplify(), f_out.simplify()) + +- + @skipIfNoSolverForLogic(logics.QF_BV) + def test_parse_examples_bv(self): + """For BV we represent a superset of the operators defined in SMT-LIB. +@@ -108,7 +107,18 @@ class TestSMTParseExamples(TestCase): + self.assertValid(Iff(f_in, f_out), f_in.serialize()) + + def test_dumped_logic(self): +- # Dumped logic matches the logic in the example ++ # Dumped logic matches the logic in the example. ++ # ++ # There are a few cases where we use a logic ++ # that does not exist in SMT-LIB, and the SMT-LIB ++ # serialization logic will find a logic that ++ # is more expressive. We need to adjust the test ++ # for those cases (see rewrite dict below). ++ rewrite = { ++ logics.QF_BOOL: logics.QF_UF, ++ logics.BOOL: logics.LRA, ++ logics.QF_NIRA: logics.AUFNIRA, ++ } + fs = get_example_formulae() + + for (f_out, _, _, logic) in fs: +@@ -121,14 +131,9 @@ class TestSMTParseExamples(TestCase): + for cmd in script_in: + if cmd.name == "set-logic": + logic_in = cmd.args[0] +- if logic == logics.QF_BOOL: +- self.assertEqual(logic_in, logics.QF_UF) +- elif logic == logics.BOOL: +- self.assertEqual(logic_in, logics.LRA) +- else: +- self.assertEqual(logic_in, logic, script_in) ++ self.assertEqual(logic_in, rewrite.get(logic, logic)) + break +- else: # Loops exited normally ++ else: # Loops exited normally + print("-"*40) + print(script_in) + +@@ -136,7 +141,7 @@ class TestSMTParseExamples(TestCase): + fs = get_example_formulae() + + fdi, tmp_fname = mkstemp() +- os.close(fdi) # Close initial file descriptor ++ os.close(fdi) # Close initial file descriptor + for (f_out, _, _, _) in fs: + write_smtlib(f_out, tmp_fname) + # with open(tmp_fname) as fin: +@@ -197,7 +202,6 @@ class TestSMTParseExamples(TestCase): + f_in = script.get_last_formula() + self.assertSat(f_in) + +- + def test_int_promotion_define_fun(self): + script = """ + (define-fun x () Int 8) diff --git a/gnu/packages/patches/python-pyvex-remove-angr-dependency.patch b/gnu/packages/patches/python-pyvex-remove-angr-dependency.patch new file mode 100644 index 0000000000..dccf22bbc6 --- /dev/null +++ b/gnu/packages/patches/python-pyvex-remove-angr-dependency.patch @@ -0,0 +1,80 @@ +This patch removes the angr dependency from the pyvex these, thus +resolving a circular dependency (as angr depends on pyvex). This +patch has been taken from upstream. + +This patch is a squashed version of the following upstream patches: + +* https://github.com/angr/pyvex/commit/61fb26f223a8d8a276b702d2448a12e02c5c9c6b +* https://github.com/angr/pyvex/commit/a1fb2a4d0826b0e43bd8bbdd00b6db032643ec95 + +diff --git a/tests/test_spotter.py b/tests/test_spotter.py +index 9271ccd..bed7dd4 100644 +--- a/tests/test_spotter.py ++++ b/tests/test_spotter.py +@@ -1,6 +1,5 @@ + import os + +-import angr + import archinfo + + import pyvex +@@ -98,53 +97,28 @@ class CortexSpotter(GymratLifter): + register(CortexSpotter, "ARMEL") + + +-def test_full_binary(): +- p = angr.Project( +- os.path.join(test_location, "armel", "RTOSDemo.axf.issue_685"), +- arch="ARMEL", +- auto_load_libs=False, +- ) +- st = p.factory.call_state(0x000013CE + 1) +- b = st.block().vex +- simgr = p.factory.simulation_manager(st) +- simgr.step() +- assert b.jumpkind == "Ijk_Sys_syscall" +- assert simgr.active[0].regs.ip_at_syscall.args[0] == 0x13FB +- +- + def test_tmrs(): +- test_location = str(os.path.join(os.path.dirname(os.path.realpath(__file__)), "../../binaries/tests")) +- p = angr.Project( +- os.path.join(test_location, "armel", "helloworld"), +- arch="ARMEL", +- auto_load_libs=False, +- ) ++ arch = archinfo.arch_from_id("ARMEL") + ins = b"\xef\xf3\x08\x82" +- b = pyvex.block.IRSB(ins, 1, p.arch) ++ b = pyvex.block.IRSB(ins, 1, arch) + assert b.jumpkind == "Ijk_Boring" + assert type(b.statements[1].data) == pyvex.expr.Get +- assert p.arch.register_names.get(b.statements[1].data.offset, "") == "sp" ++ assert arch.register_names.get(b.statements[1].data.offset, "") == "sp" + assert type(b.statements[2]) == pyvex.stmt.Put + + + def test_tmsr(): +- test_location = str(os.path.join(os.path.dirname(os.path.realpath(__file__)), "../../binaries/tests")) +- p = angr.Project( +- os.path.join(test_location, "armel", "helloworld"), +- arch="ARMEL", +- auto_load_libs=False, +- ) ++ arch = archinfo.arch_from_id("ARMEL") + inss = b"\x82\xf3\x08\x88" +- b = pyvex.block.IRSB(inss, 1, p.arch, opt_level=3) ++ b = pyvex.block.IRSB(inss, 1, arch, opt_level=3) + assert b.jumpkind == "Ijk_Boring" + assert type(b.statements[1].data) == pyvex.expr.Get +- assert p.arch.register_names.get(b.statements[1].data.offset, "") == "r2" ++ assert arch.register_names.get(b.statements[1].data.offset, "") == "r2" + assert type(b.statements[2]) == pyvex.stmt.Put + + + if __name__ == "__main__": + test_basic() + test_embedded() +- test_full_binary() + test_tmrs() + test_tmsr() diff --git a/gnu/packages/patches/python-waitress-fix-tests.patch b/gnu/packages/patches/python-waitress-fix-tests.patch deleted file mode 100644 index 110492a604..0000000000 --- a/gnu/packages/patches/python-waitress-fix-tests.patch +++ /dev/null @@ -1,29 +0,0 @@ -Skip test that requires getaddrinfo(), which is not available in the build -environment. This package uses a regexp for finding tests (see runner.py), -so using @unittest.skip does not work. - ---- a/waitress/tests/test_adjustments.py -+++ b/waitress/tests/test_adjustments.py -@@ -185,22 +185,6 @@ - def test_bad_port(self): - self.assertRaises(ValueError, self._makeOne, listen='127.0.0.1:test') - -- def test_service_port(self): -- if WIN and PY2: # pragma: no cover -- # On Windows and Python 2 this is broken, so we raise a ValueError -- self.assertRaises( -- ValueError, -- self._makeOne, -- listen='127.0.0.1:http', -- ) -- return -- -- inst = self._makeOne(listen='127.0.0.1:http 0.0.0.0:https') -- -- bind_pairs = [sockaddr[:2] for (_, _, _, sockaddr) in inst.listen] -- -- self.assertEqual(bind_pairs, [('127.0.0.1', 80), ('0.0.0.0', 443)]) -- - def test_dont_mix_host_port_listen(self): - self.assertRaises( - ValueError, diff --git a/gnu/packages/patches/python-xmp-toolkit-add-missing-error-codes.patch b/gnu/packages/patches/python-xmp-toolkit-add-missing-error-codes.patch new file mode 100644 index 0000000000..17bdae188f --- /dev/null +++ b/gnu/packages/patches/python-xmp-toolkit-add-missing-error-codes.patch @@ -0,0 +1,51 @@ +From fd9e887a1853d9b4bc3fce20d414d648fb5abbfc Mon Sep 17 00:00:00 2001 +From: Asher Glick <asher.glick@gmail.com> +Date: Mon, 1 Mar 2021 14:35:46 -0600 +Subject: [PATCH] Add missing error codes and graceful handling of possible + future missing codes. + +--- + libxmp/exempi.py | 14 +++++++++++++- + 1 file changed, 13 insertions(+), 1 deletion(-) + +diff --git a/libxmp/exempi.py b/libxmp/exempi.py +index 683e240..f58003c 100644 +--- a/libxmp/exempi.py ++++ b/libxmp/exempi.py +@@ -85,6 +85,7 @@ ERROR_MESSAGE = { 0: "unknown error", + -13: "std exception", + -14: "unknown exception", + -15: "no memory", ++ -16: "progress abort", + -101: "bad schema", + -102: "bad XPath", + -103: "bad options", +@@ -95,6 +96,14 @@ ERROR_MESSAGE = { 0: "unknown error", + -108: "bad file format", + -109: "no file handler", + -110: "too large for JPEG", ++ -111: "no file", ++ -112: "file permission error", ++ -113: "disk space", ++ -114: "read error", ++ -115: "write error", ++ -116: "bad block format", ++ -117: "file path not a file", ++ -118: "rejected file extension", + -201: "bad XML", + -202: "bad RDF", + -203: "bad XMP", +@@ -1697,6 +1706,9 @@ def check_error(success): + # so we supplement it by explicitly checking the error code. + ecode = EXEMPI.xmp_get_error() + if not success or ecode != 0: +- error_msg = ERROR_MESSAGE[ecode] ++ if ecode in ERROR_MESSAGE: ++ error_msg = ERROR_MESSAGE[ecode] ++ else: ++ error_msg = "Unexpected error code " + str(ecode) + msg = 'Exempi function failure ("{0}").'.format(error_msg) + raise XMPError(msg) +-- +2.30.2 + diff --git a/gnu/packages/patches/racket-backport-8.12-chez-configure.patch b/gnu/packages/patches/racket-backport-8.12-chez-configure.patch deleted file mode 100644 index 483948fec9..0000000000 --- a/gnu/packages/patches/racket-backport-8.12-chez-configure.patch +++ /dev/null @@ -1,423 +0,0 @@ -From 82157f5b3fb9f71ad7fc978c428d423d06a4a0df Mon Sep 17 00:00:00 2001 -From: Philip McGrath <philip@philipmcgrath.com> -Date: Wed, 28 Feb 2024 19:41:22 -0500 -Subject: [PATCH 1/2] Chez Scheme: Repairs and improvements for building with - external dependencies - -* configure: support `ZUO=<zuo>` - -Supplying `ZUO=<zuo>` skips the submodule check in `configure` -and configures the generated makefile not to build or remove Zuo. - -* configure: support `STEXLIB=<stex>` - -For compatibility with older scripts, when not explicitly configured, -continue to honor the `STEXLIB` environment variable at build time. - -(cherry picked from commit 694fbd47a125c7fde10a328c6fda199dac19f802) ---- - racket/src/ChezScheme/BUILDING | 5 ++-- - racket/src/ChezScheme/build.zuo | 13 +++++++--- - racket/src/ChezScheme/configure | 27 ++++++++++++++++++++- - racket/src/ChezScheme/makefiles/Makefile.in | 6 ++--- - 4 files changed, 40 insertions(+), 11 deletions(-) - -diff --git a/racket/src/ChezScheme/BUILDING b/racket/src/ChezScheme/BUILDING -index 50fde27771..2df29b5bd8 100644 ---- a/racket/src/ChezScheme/BUILDING -+++ b/racket/src/ChezScheme/BUILDING -@@ -155,7 +155,8 @@ information on the supported options. - The generated makefile mostly just ensures that a `zuo` executable is - built in a `bin` directory, and then it defers the actual build work - to `zuo`, which uses the "main.zuo" file. If you have `zuo` installed, --you can use `zuo` directly instead of `make`. In general, instead of -+you can use `zuo` directly instead of `make`: in that case, you may -+wish to use `./configure ZUO=<zuo>`. In general, instead of - the command `make X` to build target `X` as described below, you can - use `zuo . X` (or `bin/zuo . X` after `bin/zuo` is built). - -@@ -339,7 +340,7 @@ The makefile supports several targets: - * `make clean` - - Removes all built elements from the workarea, and then removes -- `bin/zuo`. -+ `bin/zuo` (unless configured with `ZUO=<zuo>`). - - - WINDOWS VIA COMMAND PROMPT -diff --git a/racket/src/ChezScheme/build.zuo b/racket/src/ChezScheme/build.zuo -index a211632a89..432cc6e5a1 100644 ---- a/racket/src/ChezScheme/build.zuo -+++ b/racket/src/ChezScheme/build.zuo -@@ -218,10 +218,15 @@ - token)) - - (define stexlib -- (let ((found (assoc "STEXLIB" (hash-ref (runtime-env) 'env)))) -- (if found -- (cdr found) -- (at-source "stex")))) -+ (let ([configured (hash-ref config 'STEXLIB "")] -+ [env (assoc "STEXLIB" (hash-ref (runtime-env) 'env))]) -+ (cond -+ [(not (equal? "" configured)) -+ configured] -+ [env -+ (cdr env)] -+ [else -+ (at-source "stex")]))) - (define stex-sources - (source-tree stexlib)) - -diff --git a/racket/src/ChezScheme/configure b/racket/src/ChezScheme/configure -index 721d1d1335..f88c6f7625 100755 ---- a/racket/src/ChezScheme/configure -+++ b/racket/src/ChezScheme/configure -@@ -93,6 +93,7 @@ default_warning_flags="-Wpointer-arith -Wall -Wextra -Wno-implicit-fallthrough" - CFLAGS_ADD= - zlibLib= - LZ4Lib= -+STEXLIB= - Kernel=KernelLib - buildKernelOnly=no - enableFrompb=yes -@@ -102,6 +103,7 @@ empetite=no - moreBootFiles= - preloadBootFiles= - alwaysUseBootFile= -+zuoExternal= - - CONFIG_UNAME=`uname` - -@@ -442,6 +444,12 @@ while [ $# != 0 ] ; do - LZ4=*) - LZ4Lib=`echo $1 | sed -e 's/^LZ4=//'` - ;; -+ STEXLIB=*) -+ STEXLIB=`echo $1 | sed -e 's/^STEXLIB=//'` -+ ;; -+ ZUO=*) -+ zuoExternal=`echo $1 | sed -e 's/^ZUO=//'` -+ ;; - *) - echo "option '$1' unrecognized or missing an argument; try $0 --help" - exit 1 -@@ -667,6 +675,8 @@ if [ "$help" = "yes" ]; then - echo " STRIP=<strip> executable stripper" - echo " ZLIB=<lib> link to <lib> instead of own zlib" - echo " LZ4=<lib> link to <lib> instead of own LZ4" -+ echo " STEXLIB=<stex> build docs with <stex> instead of own stex" -+ echo " ZUO=<zuo> build with <zuo> instead of own Zuo" - echo "" - echo "Available machine types: $machs" - echo "" -@@ -869,6 +879,16 @@ if [ "$addflags" = "yes" ] ; then - fi - fi - -+if [ "${zuoExternal}" = "" ] ; then -+ ZUO="bin/zuo" -+ RM_ZUO="rm -f bin/zuo" -+ ZUO_TARGET="bin/zuo" -+else -+ ZUO="${zuoExternal}" -+ RM_ZUO="@echo 'Not cleaning external ${zuoExternal}'" -+ ZUO_TARGET="DoNotBuildZuo" -+fi -+ - # more compile and link flags for c/Mf-unix and mats/Mf-unix - mdinclude= - mdcppflags= -@@ -1039,7 +1059,7 @@ cp "$srcdir"/makefiles/buildmain.zuo main.zuo - # Some idea, but in the workarea, so it refers to "workarea.zuo" here: - cp "$srcdir"/makefiles/workmain.zuo $w/main.zuo - --# The content of "$w/Makefile" records configuration decisions, -+# The content of "$w/Mf-config" records configuration decisions, - # and the Zuo build script takes it from there - cat > $w/Mf-config << END - srcdir=$srcdir -@@ -1075,6 +1095,7 @@ cursesLib=$cursesLib - ncursesLib=$ncursesLib - zlibLib=$zlibLib - LZ4Lib=$LZ4Lib -+STEXLIB=$STEXLIB - warningFlags=$warningFlags - Kernel=$Kernel - installscriptname=$installscriptname -@@ -1086,6 +1107,10 @@ preloadBootFiles=$preloadBootFiles - alwaysUseBootFile=$alwaysUseBootFile - relativeBootFiles=$relativeBootFiles - -+ZUO=$ZUO -+RM_ZUO=$RM_ZUO -+ZUO_TARGET=$ZUO_TARGET -+ - InstallBin=$installbin - InstallLib=$installlib - InstallMan=$installman/man1 -diff --git a/racket/src/ChezScheme/makefiles/Makefile.in b/racket/src/ChezScheme/makefiles/Makefile.in -index cfdd0230a3..4865bf2e2f 100644 ---- a/racket/src/ChezScheme/makefiles/Makefile.in -+++ b/racket/src/ChezScheme/makefiles/Makefile.in -@@ -3,8 +3,6 @@ workarea=$(w) - - include $(workarea)/Mf-config - --ZUO=bin/zuo -- - .PHONY: build - build: $(ZUO) - + $(ZUO) $(workarea) MAKE="$(MAKE)" -@@ -140,9 +138,9 @@ pkg: $(ZUO) - .PHONY: clean - clean: $(ZUO) - + $(ZUO) $(workarea) clean MAKE="$(MAKE)" -- rm -f bin/zuo -+ $(RM_ZUO) - - # Using `+` here means that $(ZUO) gets built even if `-n`/`--dry-run` is provided to `make` --$(ZUO): $(srcdir)/../zuo/zuo.c -+$(ZUO_TARGET): $(srcdir)/../zuo/zuo.c - + mkdir -p bin - + $(CC_FOR_BUILD) -DZUO_LIB_PATH='"'"$(upsrcdir)/../zuo/lib"'"' -o $(ZUO) $(srcdir)/../zuo/zuo.c - -base-commit: 78fef00d4d16a79fdf6ab31924b3a80cadf4b368 --- -2.41.0 - - -From e2bc69c5ce7437dd9a1b30ac1b12b3a56872c491 Mon Sep 17 00:00:00 2001 -From: Matthew Flatt <mflatt@racket-lang.org> -Date: Sun, 10 Mar 2024 09:13:40 -0600 -Subject: [PATCH 2/2] Chez Scheme: adjust `configure ZUO=<command>` support - -Continuing from 694fbd47a1, adjust the generated makefile so the -supplied `<command>` is not a makefile dependency. That way, `ZUO=zuo` -works if `zuo` is installed and the current build directory is not the -source directory. (The `zuo` executable is a dependency in a real and -relevant sense, but not in the sense of dependencies that we normally -track in makefiles.) - -Also adapt the makefile for the case that `ZUO=...` is not supplied -and the build directory is not the source directory, in which case -`ZUO_LIB_PATH` needs to be relative to the source directory. - -Using `make ZUO=zuo` can also work, but in that case, `bin/zuo` is -still built as a dependency. It's possible that some portable makefile -magic could overcome that limitation, but it doesn't seem important. - -(cherry picked from commit 28157ba88d48fe645563f46f6c00d6626b3428fa) ---- - racket/src/ChezScheme/configure | 3 + - racket/src/ChezScheme/makefiles/Makefile.in | 70 +++++++++++---------- - 2 files changed, 40 insertions(+), 33 deletions(-) - -diff --git a/racket/src/ChezScheme/configure b/racket/src/ChezScheme/configure -index f88c6f7625..201dbe580f 100755 ---- a/racket/src/ChezScheme/configure -+++ b/racket/src/ChezScheme/configure -@@ -881,10 +881,12 @@ fi - - if [ "${zuoExternal}" = "" ] ; then - ZUO="bin/zuo" -+ ZUO_DEP="${ZUO}" - RM_ZUO="rm -f bin/zuo" - ZUO_TARGET="bin/zuo" - else - ZUO="${zuoExternal}" -+ ZUO_DEP="" - RM_ZUO="@echo 'Not cleaning external ${zuoExternal}'" - ZUO_TARGET="DoNotBuildZuo" - fi -@@ -1108,6 +1110,7 @@ alwaysUseBootFile=$alwaysUseBootFile - relativeBootFiles=$relativeBootFiles - - ZUO=$ZUO -+ZUO_DEP=$ZUO_DEP - RM_ZUO=$RM_ZUO - ZUO_TARGET=$ZUO_TARGET - -diff --git a/racket/src/ChezScheme/makefiles/Makefile.in b/racket/src/ChezScheme/makefiles/Makefile.in -index 4865bf2e2f..5ce237178e 100644 ---- a/racket/src/ChezScheme/makefiles/Makefile.in -+++ b/racket/src/ChezScheme/makefiles/Makefile.in -@@ -4,51 +4,55 @@ workarea=$(w) - include $(workarea)/Mf-config - - .PHONY: build --build: $(ZUO) -+build: $(ZUO_DEP) - + $(ZUO) $(workarea) MAKE="$(MAKE)" - - .PHONY: run --run: $(ZUO) -+run: $(ZUO_DEP) - + $(ZUO) $(workarea) run - - .PHONY: kernel --kernel: $(ZUO) -+kernel: $(ZUO_DEP) - + $(ZUO) $(workarea) kernel MAKE="$(MAKE)" - - .PHONY: install --install: $(ZUO) -+install: $(ZUO_DEP) - $(ZUO) $(workarea) install MAKE="$(MAKE)" - - .PHONY: uninstall --uninstall: $(ZUO) -+uninstall: $(ZUO_DEP) - + $(ZUO) $(workarea) uninstall MAKE="$(MAKE)" - --.PHONY: test --test: $(ZUO) -- + $(ZUO) $(workarea) test MAKE="$(MAKE)" -+.PHONY: test-one -+test-one: $(ZUO_DEP) -+ + $(ZUO) $(workarea) test-one MAKE="$(MAKE)" - - .PHONY: test-some-fast --test-some-fast: $(ZUO) -+test-some-fast: $(ZUO_DEP) - + $(ZUO) $(workarea) test-some-fast MAKE="$(MAKE)" - - .PHONY: test-some --test-some: $(ZUO) -+test-some: $(ZUO_DEP) - + $(ZUO) $(workarea) test-some MAKE="$(MAKE)" - -+.PHONY: test -+test: $(ZUO_DEP) -+ + $(ZUO) $(workarea) test MAKE="$(MAKE)" -+ - .PHONY: test-more --test-more: $(ZUO) -+test-more: $(ZUO_DEP) - + $(ZUO) $(workarea) test-more MAKE="$(MAKE)" - - .PHONY: coverage --coverage: $(ZUO) -+coverage: $(ZUO_DEP) - + $(ZUO) $(workarea) coverage MAKE="$(MAKE)" - - .PHONY: bootfiles --bootfiles: $(ZUO) -+bootfiles: $(ZUO_DEP) - + $(ZUO) $(workarea) bootfiles MAKE="$(MAKE)" - - .PHONY: reset --reset: $(ZUO) -+reset: $(ZUO_DEP) - + $(ZUO) $(workarea) reset MAKE="$(MAKE)" - - # Supply XM=<machine> to build boot files for <machine> -@@ -57,86 +61,86 @@ boot: - + $(ZUO) $(workarea) boot "$(XM)" MAKE="$(MAKE)" - - # `<machine>.boot` as alias for `boot XM=<machine>` --%.boot: $(ZUO) -+%.boot: $(ZUO_DEP) - + $(ZUO) $(workarea) boot $* MAKE="$(MAKE)" - - .PHONY: auto.boot --auto.boot: $(ZUO) -+auto.boot: $(ZUO_DEP) - + $(ZUO) $(workarea) boot MAKE="$(MAKE)" - - SCHEME=scheme - - .PHONY: cross.boot --cross.boot: $(ZUO) -+cross.boot: $(ZUO_DEP) - + $(ZUO) $(workarea) boot SCHEME="$(SCHEME)" MAKE="$(MAKE)" - - .PHONY: re.boot --re.boot: $(ZUO) -+re.boot: $(ZUO_DEP) - + $(ZUO) $(workarea) reboot SCHEME="$(SCHEME)" - - # Supply XM=<machine> to build boot files for <machine> - # with o=3 d=0 for the cross compiler, and only after - # building the kernel for the configured machine - .PHONY: bootquick --bootquick: $(ZUO) -+bootquick: $(ZUO_DEP) - + $(ZUO) $(workarea) bootquick "$(XM)" MAKE="$(MAKE)" - - # `<machine>.bootquick` as alias for `boot XM=<machine>` --%.bootquick: $(ZUO) -+%.bootquick: $(ZUO_DEP) - + $(ZUO) $(workarea) bootquick $* MAKE="$(MAKE)" - --auto.bootquick: $(ZUO) -+auto.bootquick: $(ZUO_DEP) - + $(ZUO) $(workarea) bootquick MAKE="$(MAKE)" - - # Supply XM=<machine>-<tag>.bootpbchunk to repackage boot files for - # <machine> with pbchunk sources, including additional - # boot files - .PHONY: bootpbchunk --bootpbchunk: $(ZUO) -+bootpbchunk: $(ZUO_DEP) - + $(ZUO) $(workarea) bootpbchunk "$(XM)" $(ARGS) MAKE="$(MAKE)" - - # `<machine>.bootpbchunk` as alias for `pbchunk XM=<machine>` --%.bootpbchunk: $(ZUO) -+%.bootpbchunk: $(ZUO_DEP) - + $(ZUO) $(workarea) bootpbchunk $* $(ARGS) MAKE="$(MAKE)" - - .PHONY: docs --docs: build $(ZUO) -+docs: build $(ZUO_DEP) - + $(ZUO) $(workarea) docs MAKE="$(MAKE)" - - .PHONY: csug --csug: build $(ZUO) -+csug: build $(ZUO_DEP) - + $(ZUO) $(workarea) csug MAKE="$(MAKE)" - - .PHONY: release_notes --release_notes: build $(ZUO) -+release_notes: build $(ZUO_DEP) - + $(ZUO) $(workarea) release_notes MAKE="$(MAKE)" - - .PHONY: install-docs --install-docs: build $(ZUO) -+install-docs: build $(ZUO_DEP) - + $(ZUO) $(workarea) install-docs MAKE="$(MAKE)" - - .PHONY: install-csug --install-csug: build $(ZUO) -+install-csug: build $(ZUO_DEP) - + $(ZUO) $(workarea) install-csug MAKE="$(MAKE)" - - .PHONY: install-release_notes --install-release_notes: build $(ZUO) -+install-release_notes: build $(ZUO_DEP) - + $(ZUO) $(workarea) install-release_notes MAKE="$(MAKE)" - - .PHONY: bintar --bintar: $(ZUO) -+bintar: $(ZUO_DEP) - + $(ZUO) $(workarea) bintar MAKE="$(MAKE)" - - .PHONY: rpm --rpm: $(ZUO) -+rpm: $(ZUO_DEP) - + $(ZUO) $(workarea) rpm MAKE="$(MAKE)" - - .PHONY: pkg --pkg: $(ZUO) -+pkg: $(ZUO_DEP) - + $(ZUO) $(workarea) pkg MAKE="$(MAKE)" - - .PHONY: clean --clean: $(ZUO) -+clean: $(ZUO_DEP) - + $(ZUO) $(workarea) clean MAKE="$(MAKE)" - $(RM_ZUO) - --- -2.41.0 - diff --git a/gnu/packages/patches/rust-poem-1-fewer-deps.patch b/gnu/packages/patches/rust-poem-1-fewer-deps.patch new file mode 100644 index 0000000000..b98947b407 --- /dev/null +++ b/gnu/packages/patches/rust-poem-1-fewer-deps.patch @@ -0,0 +1,229 @@ +diff --git a/Cargo.toml b/Cargo.toml +index 79b878c..95ec54c 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -71,26 +71,26 @@ features = ["clock"] + optional = true + default-features = false + +-[dependencies.eyre06] +-version = "0.6" +-optional = true +-package = "eyre" ++#[dependencies.eyre06] ++#version = "0.6" ++#optional = true ++#package = "eyre" + +-[dependencies.fluent] +-version = "0.16.0" +-optional = true ++#[dependencies.fluent] ++#version = "0.16.0" ++#optional = true + +-[dependencies.fluent-langneg] +-version = "0.13.0" +-optional = true ++#[dependencies.fluent-langneg] ++#version = "0.13.0" ++#optional = true + +-[dependencies.fluent-syntax] +-version = "0.11.0" +-optional = true ++#[dependencies.fluent-syntax] ++#version = "0.11.0" ++#optional = true + +-[dependencies.futures-util] +-version = "0.3.17" +-features = ["sink"] ++#[dependencies.futures-util] ++#version = "0.3.17" ++#features = ["sink"] + + [dependencies.headers] + version = "0.3.7" +@@ -125,9 +125,9 @@ features = [ + optional = true + default-features = false + +-[dependencies.intl-memoizer] +-version = "0.5.1" +-optional = true ++#[dependencies.intl-memoizer] ++#version = "0.5.1" ++#optional = true + + [dependencies.libcookie] + version = "0.17" +@@ -146,16 +146,16 @@ version = "0.4.1" + optional = true + package = "csrf" + +-[dependencies.libopentelemetry] +-version = "0.21.0" +-features = ["metrics"] +-optional = true +-package = "opentelemetry" ++#[dependencies.libopentelemetry] ++#version = "0.21.0" ++#features = ["metrics"] ++#optional = true ++#package = "opentelemetry" + +-[dependencies.libprometheus] +-version = "0.13.0" +-optional = true +-package = "prometheus" ++#[dependencies.libprometheus] ++#version = "0.13.0" ++#optional = true ++#package = "prometheus" + + [dependencies.libtempfile] + version = "3.2.0" +@@ -178,17 +178,17 @@ optional = true + version = "0.10.56" + optional = true + +-[dependencies.opentelemetry-http] +-version = "0.10.0" +-optional = true ++#[dependencies.opentelemetry-http] ++#version = "0.10.0" ++#optional = true + +-[dependencies.opentelemetry-prometheus] +-version = "0.14.0" +-optional = true ++#[dependencies.opentelemetry-prometheus] ++#version = "0.14.0" ++#optional = true + +-[dependencies.opentelemetry-semantic-conventions] +-version = "0.13.0" +-optional = true ++#[dependencies.opentelemetry-semantic-conventions] ++#version = "0.13.0" ++#optional = true + + [dependencies.parking_lot] + version = "0.12.0" +@@ -219,14 +219,14 @@ optional = true + version = "0.11.1" + optional = true + +-[dependencies.redis] +-version = "0.23.0" +-features = [ +- "aio", +- "tokio-comp", +- "connection-manager", +-] +-optional = true ++#[dependencies.redis] ++#version = "0.23.0" ++#features = [ ++# "aio", ++# "tokio-comp", ++# "connection-manager", ++#] ++#optional = true + + [dependencies.regex] + version = "1.5.5" +@@ -263,9 +263,9 @@ optional = true + [dependencies.smallvec] + version = "1.6.1" + +-[dependencies.sse-codec] +-version = "0.3.2" +-optional = true ++#[dependencies.sse-codec] ++#version = "0.3.2" ++#optional = true + + [dependencies.thiserror] + version = "1.0.30" +@@ -323,10 +323,10 @@ default-features = false + [dependencies.tracing] + version = "0.1.36" + +-[dependencies.unic-langid] +-version = "0.9.0" +-features = ["macros"] +-optional = true ++#[dependencies.unic-langid] ++#version = "0.9.0" ++#features = ["macros"] ++#optional = true + + [dependencies.wildmatch] + version = "2" +@@ -383,13 +383,13 @@ embed = [ + "hex", + "mime_guess", + ] +-i18n = [ +- "fluent", +- "fluent-langneg", +- "fluent-syntax", +- "unic-langid", +- "intl-memoizer", +-] ++#i18n = [ ++# "fluent", ++# "fluent-langneg", ++# "fluent-syntax", ++# "unic-langid", ++# "intl-memoizer", ++#] + multipart = ["multer"] + native-tls = [ + "server", +@@ -400,20 +400,20 @@ openssl-tls = [ + "tokio-openssl", + "openssl", + ] +-opentelemetry = [ +- "libopentelemetry", +- "opentelemetry-http", +- "opentelemetry-semantic-conventions", +-] +-prometheus = [ +- "libopentelemetry", +- "opentelemetry-prometheus", +- "libprometheus", +-] +-redis-session = [ +- "session", +- "redis", +-] ++#opentelemetry = [ ++# "libopentelemetry", ++# "opentelemetry-http", ++# "opentelemetry-semantic-conventions", ++#] ++#prometheus = [ ++# "libopentelemetry", ++# "opentelemetry-prometheus", ++# "libprometheus", ++#] ++#redis-session = [ ++# "session", ++# "redis", ++#] + rustls = [ + "server", + "tokio-rustls", +@@ -445,7 +445,7 @@ tempfile = [ + ] + test = [ + "sse", +- "sse-codec", ++# "sse-codec", + "tokio-util/compat", + ] + tower-compat = [ diff --git a/gnu/packages/patches/virt-manager-fix-gtk-cursor-theme-backtace.patch b/gnu/packages/patches/virt-manager-fix-gtk-cursor-theme-backtace.patch new file mode 100644 index 0000000000..3f7a5e6873 --- /dev/null +++ b/gnu/packages/patches/virt-manager-fix-gtk-cursor-theme-backtace.patch @@ -0,0 +1,40 @@ +This patch fixes an issue in virt-manager 4.1.0 where it errors and returns a +stack trace. Namely, Gdk.Cursor.new_from_name yields a "constructor returned +NULL" error, which causes a "'NoneType' object has no attribute 'conn'" error +later. + +See the upstream bug report for more information: + +https://github.com/virt-manager/virt-manager/issues/479 + +Patch copied from upstream source repository: + +https://github.com/virt-manager/virt-manager/commit/cc4a39ea94f42bc92765eb3bb56e2b7f9198be67 + +From cc4a39ea94f42bc92765eb3bb56e2b7f9198be67 Mon Sep 17 00:00:00 2001 +From: Cole Robinson <crobinso@redhat.com> +Date: Thu, 19 Jan 2023 11:13:56 -0500 +Subject: [PATCH] asyncjob: Fix backtrace when no cursor theme installed + +Fixes: https://github.com/virt-manager/virt-manager/issues/479 + +Signed-off-by: Cole Robinson <crobinso@redhat.com> +--- + virtManager/asyncjob.py | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/virtManager/asyncjob.py b/virtManager/asyncjob.py +index 32d9c0a16..46692acea 100644 +--- a/virtManager/asyncjob.py ++++ b/virtManager/asyncjob.py +@@ -265,9 +265,7 @@ def run(self): + self.topwin.present() + + if not self.cancel_cb and self.show_progress: +- gdk_window = self.topwin.get_window() +- gdk_window.set_cursor( +- Gdk.Cursor.new_from_name(gdk_window.get_display(), "progress")) ++ self._set_cursor("progress") + self._bg_thread.start() + + diff --git a/gnu/packages/patches/zathura-use-struct-initializers.patch b/gnu/packages/patches/zathura-use-struct-initializers.patch deleted file mode 100644 index 9a808a4bc3..0000000000 --- a/gnu/packages/patches/zathura-use-struct-initializers.patch +++ /dev/null @@ -1,68 +0,0 @@ -From c05328185292d6f6a4459024cdb563c63bfad230 Mon Sep 17 00:00:00 2001 -Message-ID: <c05328185292d6f6a4459024cdb563c63bfad230.1710315308.git.vivien@planete-kraus.eu> -From: Sebastian Ramacher <sebastian@ramacher.at> -Date: Mon, 29 Jan 2024 21:05:22 +0100 -Subject: [PATCH] Use struct initializers - ---- - zathura/page-widget.c | 4 ++-- - zathura/shortcuts.c | 12 +++++------- - 2 files changed, 7 insertions(+), 9 deletions(-) - -diff --git a/zathura/page-widget.c b/zathura/page-widget.c -index 216381e..ac85dcf 100644 ---- a/zathura/page-widget.c -+++ b/zathura/page-widget.c -@@ -1426,8 +1426,8 @@ cb_menu_image_save(GtkMenuItem* item, ZathuraPage* page) - } - - /* set command */ -- char* export_command = g_strdup_printf(":export image-p%d-%d ", page_id, image_id); -- girara_argument_t argument = { 0, export_command }; -+ char* export_command = g_strdup_printf(":export image-p%d-%d ", page_id, image_id); -+ girara_argument_t argument = {.n = 0, .data = export_command}; - sc_focus_inputbar(priv->zathura->ui.session, &argument, NULL, 0); - g_free(export_command); - -diff --git a/zathura/shortcuts.c b/zathura/shortcuts.c -index 8836cd2..35b5990 100644 ---- a/zathura/shortcuts.c -+++ b/zathura/shortcuts.c -@@ -513,7 +513,7 @@ sc_rotate(girara_session_t* session, girara_argument_t* argument, - zathura_document_set_rotation(zathura->document, (rotation + angle * t) % 360); - - /* update scale */ -- girara_argument_t new_argument = { zathura_document_get_adjust_mode(zathura->document), NULL }; -+ girara_argument_t new_argument = {.n = zathura_document_get_adjust_mode(zathura->document), .data = NULL}; - sc_adjust_window(zathura->ui.session, &new_argument, NULL, 0); - - /* render all pages again */ -@@ -1372,7 +1372,7 @@ sc_toggle_presentation(girara_session_t* session, girara_argument_t* - zathura->shortcut.toggle_presentation_mode.zoom = zathura_document_get_zoom(zathura->document); - - /* adjust window */ -- girara_argument_t argument = { ZATHURA_ADJUST_BESTFIT, NULL }; -+ girara_argument_t argument = {.n = ZATHURA_ADJUST_BESTFIT, .data = NULL}; - sc_adjust_window(session, &argument, NULL, 0); - - /* hide status and inputbar */ -@@ -1390,13 +1390,11 @@ sc_toggle_presentation(girara_session_t* session, girara_argument_t* - return false; - } - --bool --sc_quit(girara_session_t* session, girara_argument_t* UNUSED(argument), -- girara_event_t* UNUSED(event), unsigned int UNUSED(t)) --{ -+bool sc_quit(girara_session_t* session, girara_argument_t* UNUSED(argument), girara_event_t* UNUSED(event), -+ unsigned int UNUSED(t)) { - g_return_val_if_fail(session != NULL, false); - -- girara_argument_t arg = { GIRARA_HIDE, NULL }; -+ girara_argument_t arg = {.n = GIRARA_HIDE, .data = NULL}; - girara_isc_completion(session, &arg, NULL, 0); - - cb_destroy(NULL, NULL); --- -2.41.0 - diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 4e260d614d..c22c4248bc 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -431,6 +431,13 @@ When present, Poppler is able to correctly render CJK and Cyrillic text.") ,@(package-inputs poppler))) (synopsis "Qt5 frontend for the Poppler PDF rendering library"))) +(define-public poppler-qt6 + (package/inherit poppler + (name "poppler-qt6") + (inputs (modify-inputs (package-inputs poppler) + (append qtbase))) + (synopsis "Qt6 frontend for the Poppler PDF rendering library"))) + (define-public python-poppler-qt5 (package (name "python-poppler-qt5") @@ -618,7 +625,7 @@ using the DjVuLibre library.") (define-public zathura-pdf-mupdf (package (name "zathura-pdf-mupdf") - (version "0.4.1") + (version "0.4.3") (source (origin (method url-fetch) (uri @@ -626,7 +633,7 @@ using the DjVuLibre library.") "/download/zathura-pdf-mupdf-" version ".tar.xz")) (sha256 (base32 - "0bxc0b2bkzfc3mqv1g8wjvbvzv95lq34q641jdk2byi3clfs10pr")))) + "0xk7fxgx5fiafczwqlpb3hkfmfhhq2ljabxvi272m9vy13p89kwc")))) (native-inputs (list pkg-config)) (inputs (list gumbo-parser @@ -668,7 +675,7 @@ by using the @code{mupdf} rendering library.") (define-public zathura-pdf-poppler (package (name "zathura-pdf-poppler") - (version "0.3.1") + (version "0.3.2") (source (origin (method url-fetch) (uri @@ -676,24 +683,15 @@ by using the @code{mupdf} rendering library.") version ".tar.xz")) (sha256 (base32 - "12qhkshpp1wjfpjmjccsyi6wscqyqvaa19j85prjpyf65i9jg0gf")))) + "049h8m9swxni7ar6fsbm0hb3fg4ffmjc3m6vyg78ilfi3kayxavi")))) (native-inputs (list pkg-config)) (inputs (list poppler zathura)) (build-system meson-build-system) (arguments - `(#:tests? #f ; package does not include tests - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-plugin-directory - ;; Something of a regression in 0.2.9: the new Meson build system - ;; now hard-codes an incorrect plugin directory. Fix it. - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "meson.build" - (("(install_dir:).*" _ key) - (string-append key - "'" (assoc-ref outputs "out") "/lib/zathura'\n"))) - #t))))) + (list #:tests? #f ; package does not include tests + #:configure-flags + #~(list (string-append "-Dplugindir=" #$output "/lib/zathura")))) (home-page "https://pwmt.org/projects/zathura-pdf-poppler/") (synopsis "PDF support for zathura (poppler backend)") (description "The zathura-pdf-poppler plugin adds PDF support to zathura @@ -703,7 +701,7 @@ by using the poppler rendering engine.") (define-public zathura (package (name "zathura") - (version "0.5.4") + (version "0.5.6") (source (origin (method url-fetch) (uri @@ -711,8 +709,7 @@ by using the poppler rendering engine.") version ".tar.xz")) (sha256 (base32 - "0ckgamf98sydq543arp865jg1afwzhpzcsbhv6zrch2dm5x7y0x3")) - (patches (search-patches "zathura-use-struct-initializers.patch")))) + "1nhhdww8z6i2cmj7n6qjgyh49dy4jf0xq4j13djpvrfchxgf6y5l")))) (build-system meson-build-system) (arguments (list @@ -833,14 +830,14 @@ and based on PDF specification 1.7.") (define-public mupdf (package (name "mupdf") - (version "1.23.11") + (version "1.24.7") (source (origin (method url-fetch) (uri (string-append "https://mupdf.com/downloads/archive/" "mupdf-" version "-source.tar.lz")) (sha256 - (base32 "1kv44zqijkvljc9fcqmgb8zqkj7hmasga70fsz98aimmrfc2rmyv")) + (base32 "0hydmp8sdnkrkpqyysa6klkxbwv9awf1xc753r27gcj7ds7375fj")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) @@ -892,6 +889,7 @@ and based on PDF specification 1.7.") "USE_SYSTEM_CURL=yes" "USE_SYSTEM_LEPTONICA=yes" "USE_SYSTEM_TESSERACT=yes" + "USE_SONAME=no" ;install as libmupdf.so "shared=yes" (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib") (string-append "prefix=" #$output)) diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index 4d29535054..47511fb0e4 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2022, 2023 John Kehayias <john.kehayias@protonmail.com> ;;; Copyright © 2022 Sharlatan Hellseher <sharlatanus@gmail.com> ;;; Copyright © 2023 Bruno Victal <mirai@makinata.eu> +;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -186,14 +187,14 @@ cards and generate meaningful file and folder names.") (define-public libraw (package (name "libraw") - (version "0.20.0") + (version "0.21.2") (source (origin (method url-fetch) (uri (string-append "https://www.libraw.org/data/LibRaw-" version ".tar.gz")) (sha256 (base32 - "18wlsvj6c1rv036ph3695kknpgzc3lk2ikgshy8417yfl8ykh2hz")))) + "00sbscniqrwj341gyvzkgcidfkmscgxx05s4dsplp186680qhwpy")))) (build-system gnu-build-system) (native-inputs (list pkg-config)) diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm index e5e766f576..6f7e2c3fd9 100644 --- a/gnu/packages/php.scm +++ b/gnu/packages/php.scm @@ -62,7 +62,7 @@ (define-public php (package (name "php") - (version "8.3.8") + (version "8.3.9") (home-page "https://www.php.net/") (source (origin (method url-fetch) @@ -70,7 +70,7 @@ "php-" version ".tar.xz")) (sha256 (base32 - "1mxqbfp1jlrqc72wym798wyi6nckbc0cjl6kpg147yc6c6smi8xf")) + "0xvcmm2i9kkl2m0grw0nxhqa4hgrss5jg1c4z1j60d8als77nkdz")) (modules '((guix build utils))) (snippet '(with-directory-excursion "ext" diff --git a/gnu/packages/plan9.scm b/gnu/packages/plan9.scm index b2d8d75471..862eeb9802 100644 --- a/gnu/packages/plan9.scm +++ b/gnu/packages/plan9.scm @@ -28,15 +28,19 @@ #:use-module (gnu packages bash) #:use-module (gnu packages commencement) #:use-module (gnu packages fontutils) + #:use-module (gnu packages freedesktop) + #:use-module (gnu packages linux) #:use-module (gnu packages perl) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages xdisorg) #:use-module (gnu packages xorg)) (define-public drawterm (let ((revision "1") - (commit "c97fe4693f6112504d6f13fab46f7cc8b27685c1")) + (commit "f11139d4c918802a87730bc14d094670ee4ce572")) (package (name "drawterm") - (version (git-version "20210628" revision commit)) + (version (git-version "20240703" revision commit)) (source (origin (method git-fetch) @@ -45,7 +49,7 @@ (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "059sl60ap6c9lz8k91k6bd34694a290wm0s93b2vfszzzv683spw")))) + (base32 "0ggh5g19899iq9bb5r03bvhamndyai4ylr3ajkbd02xkhz65fh5y")))) (build-system gnu-build-system) (arguments `(#:make-flags (list "CONF=unix" @@ -71,6 +75,20 @@ Plan 9 systems. It behaves like a Plan 9 kernel and will attempt to reconstruct a Plan 9 terminal-like experience from a non-Plan 9 system.") (license license:expat)))) +(define-public drawterm-wayland + (package + (inherit drawterm) + (name "drawterm-wayland") + (arguments + (substitute-keyword-arguments (package-arguments drawterm) + ((#:make-flags _) + `(list "CONF=linux" + ,(string-append "CC=" (cc-for-target)))))) + (native-inputs + (list pkg-config)) + (inputs + (list libxkbcommon pipewire wayland wayland-protocols wlr-protocols)))) + (define-public plan9port ;; no releases (let ((commit "f8681acb374fa0d5ed1568dbedb00a4abe1ca6f1") diff --git a/gnu/packages/polkit.scm b/gnu/packages/polkit.scm index 337d9b9a73..58a8a236f7 100644 --- a/gnu/packages/polkit.scm +++ b/gnu/packages/polkit.scm @@ -171,30 +171,29 @@ for unprivileged applications.") (define-public polkit-qt (package (name "polkit-qt") - (version "1-0.114.0") + (version "0.200.0") (source (origin - (method url-fetch) - (uri (string-append - "mirror://kde/stable/polkit-qt-1/" - "polkit-qt-" version ".tar.xz")) - (sha256 - (base32 - "0zlhwgkqn8g0rkjc7c5n7fbhyyl4jcv0rg5zlbzrb0l88ljg5c1f")))) + (method url-fetch) + (uri (string-append + "mirror://kde/stable/polkit-qt-1/" + name "-1-" version ".tar.xz")) + (sha256 + (base32 + "1yvp2s72fgpn5kf1a2ldy0givlmz0z4i1fsh6ylpcard0qf62fsx")))) (build-system cmake-build-system) (inputs - (list polkit)) - (propagated-inputs - (list qtbase-5)) + (list qtbase-5 polkit)) (native-inputs (list pkg-config)) (arguments - `(#:configure-flags (list (string-append "-DCMAKE_INSTALL_RPATH=" - (assoc-ref %outputs "out") - "/lib:" - (assoc-ref %outputs "out") - "/lib64")) - #:tests? #f)) ; there is a test subdirectory, but no test target + (list #:configure-flags + #~(list (string-append + "-DQT_MAJOR_VERSION=" + #$(version-major + (package-version (this-package-input "qtbase"))))) + #:tests? #f)) ; there is a test subdirectory, but no test target (home-page "https://api.kde.org/kdesupport-api/polkit-qt-1-apidocs/") + (properties `((upstream-name . "polkit-qt-1"))) (synopsis "Qt frontend to the polkit library") (description "Polkit-qt is a library that lets developers use the PolicyKit API through a Qt-styled API. It is mainly a wrapper around @@ -202,6 +201,13 @@ QAction and QAbstractButton that lets you integrate those two component easily with PolicyKit.") (license lgpl2.0+))) +(define-public polkit-qt6 + (package + (inherit polkit-qt) + (name "polkit-qt6") + (inputs (modify-inputs (package-inputs polkit-qt) + (replace "qtbase" qtbase))))) + (define-public polkit-gnome (package (name "polkit-gnome") diff --git a/gnu/packages/potassco.scm b/gnu/packages/potassco.scm index b7cfca2eec..5432fc10c3 100644 --- a/gnu/packages/potassco.scm +++ b/gnu/packages/potassco.scm @@ -112,6 +112,7 @@ between aspif and smodels format or to a human-readable text format.") (url "https://github.com/potassco/clasp") (commit (string-append "v" version)))) (file-name (git-file-name name version)) + (patches (search-patches "clasp-hide-event-ids.patch")) (sha256 (base32 "0qap7rar8a5mkqz28n2hnvr4cfv5x0rh4zs3wdp919dw4d034chr")))) @@ -200,22 +201,7 @@ satisfiability checking (SAT).") (substitute* "cmake/ClingoConfig.cmake.in" (("find_package\\(Clasp") "find_package(clasp")) (rename-file "cmake/ClingoConfig.cmake.in" - "cmake/clingo-config.cmake.in"))) - (add-after 'unpack 'skip-failing-tests - (lambda _ - (with-directory-excursion "libclingo/tests" - (substitute* "CMakeLists.txt" - (("COMMAND test_clingo" all) - (string-append all - " -f " - "\"${CMAKE_CURRENT_SOURCE_DIR}/good.txt\""))) - (call-with-output-file "good.txt" - (lambda (port) - (for-each (lambda (test) (format port "~s~%" test)) - '("parse-ast-v2" "add-ast-v2" "build-ast-v2" - "unpool-ast-v2" "parse_term" - "propagator" "propgator-sequence-mining" - "symbol" "visitor")))))))))) + "cmake/clingo-config.cmake.in")))))) (inputs (list catch2-3 clasp libpotassco)) (native-inputs (list bison re2c mpark-variant @@ -465,10 +451,7 @@ directly from the python command line."))) (lambda _ ;; noclingo tests rely on this being set (setenv "CLORM_NOCLINGO" "1") - (delete-file "tests/test_mypy_query.py") - (substitute* "tests/test_clingo.py" - (("self\\.assertTrue\\(os_called\\)" all) - (string-append "# " all)))))))) + (delete-file "tests/test_mypy_query.py")))))) (propagated-inputs (list python-clingo)) (native-inputs (list python-typing-extensions)) (home-page "https://potassco.org") @@ -627,14 +610,6 @@ which allows user interfaces to be specified entirely as a logic program.") (base32 "0xzbby9ram55h87ykm652kgm45b8rlhbjc8gjkz308h1jnjllmmy")))) (build-system pyproject-build-system) - (arguments - (list #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'delete-failing-tests - (lambda _ - ;; XXX: Clingo statistics are broken in dependencies already. - (for-each delete-file '("tests/test_solver.py" - "tests/test_test.py"))))))) (inputs (list python-clingo)) (native-inputs (list python-pytest)) (home-page "https://potassco.org/clintest/") diff --git a/gnu/packages/prolog.scm b/gnu/packages/prolog.scm index 65b60c19d6..2c79a9948b 100644 --- a/gnu/packages/prolog.scm +++ b/gnu/packages/prolog.scm @@ -180,7 +180,7 @@ it.") (define-public trealla (package (name "trealla") - (version "2.53.37") + (version "2.55.7") (source (origin (method git-fetch) @@ -189,7 +189,7 @@ it.") (url "https://github.com/trealla-prolog/trealla") (commit (string-append "v" version)))) (sha256 - (base32 "15y9kwasz5aghhja3d8ngl7018z6h55xib19sr9lifkzjff5zv1w")) + (base32 "1szk00nbb6n92yl57n86yp9nhj2z3ymi0chzrwrz0xkv49grwx0y")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (native-inputs diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm index d79427f28a..cb46af3490 100644 --- a/gnu/packages/python-check.scm +++ b/gnu/packages/python-check.scm @@ -1225,22 +1225,17 @@ simpler.") (uri (pypi-uri "pytest-trio" version)) (sha256 (base32 "0c8cqf9by2884riksrqymqfp2g1d2d798a2zalcw9hmf34c786y0")))) - (build-system python-build-system) + (build-system pyproject-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? inputs outputs #:allow-other-keys) - (when tests? - (add-installed-pythonpath inputs outputs) - (invoke "pytest" "-W" "error" "-ra" "-v" "--pyargs" - "pytest_trio" "--verbose" "--cov" "-k" - (string-append - ;; Needs network - "not test_async_yield_fixture_with_nursery" - " and not test_try" - ;; No keyboard interrupt in our build environment. - " and not test_actual_test")))))))) + (list + #:test-flags '(list "-W" "error" "-ra" "-v" "--pyargs" + "pytest_trio" "--verbose" "--cov" "-k" + (string-append + ;; Needs network + "not test_async_yield_fixture_with_nursery" + " and not test_try" + ;; No keyboard interrupt in our build environment. + " and not test_actual_test")))) (native-inputs (list python-hypothesis python-pytest python-pytest-cov)) (propagated-inputs diff --git a/gnu/packages/python-compression.scm b/gnu/packages/python-compression.scm index 96e607bfe9..cfabc618d2 100644 --- a/gnu/packages/python-compression.scm +++ b/gnu/packages/python-compression.scm @@ -173,11 +173,13 @@ were a single file.") ("rust-zstd" ,rust-zstd-0.11)) #:install-source? #f)) (native-inputs (list maturin + pkg-config python-pytest python-pytest-xdist python-numpy python-hypothesis python-wrapper)) + (inputs (list `(,zstd "lib"))) (home-page "https://github.com/milesgranger/cramjam") (synopsis "Python bindings to compression algorithms in Rust") (description diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index d25059c86b..ffafee7dd6 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 <eric@dvorsak.fr> -;;; Copyright © 2015-2021, 2023 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2015-2021, 2023, 2024 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2015, 2016, 2017, 2019 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016, 2017, 2020, 2022, 2023 Marius Bakke <marius@gnu.org> ;;; Copyright © 2017 Ben Sturmfels <ben@sturm.com.au> @@ -523,16 +523,18 @@ def contents() -> str: (define-public python-cryptography-vectors (package (name "python-cryptography-vectors") - (version "41.0.4") + (version "42.0.5") (source (origin (method url-fetch) (uri (pypi-uri "cryptography_vectors" version)) (sha256 (base32 - "17m1azxfc3w0390jp9mkx1v0k3xfv4v1lrgch4hvbbm77s0z42j4")))) + "1lcflcvv0xjz5cyvf33iav1vd91qzjvl4w7h4qaxlcnbn3ixap2h")))) (build-system pyproject-build-system) (arguments (list #:tests? #f)) ; No tests included. + (native-inputs + (list python-flit-core)) (home-page "https://github.com/pyca/cryptography") (synopsis "Test vectors for the cryptography package") (description @@ -543,14 +545,14 @@ def contents() -> str: (define-public python-cryptography (package (name "python-cryptography") - (version "41.0.4") + (version "42.0.5") (source (origin (method url-fetch) (uri (pypi-uri "cryptography" version)) (sha256 (base32 - "06pm952pr6f31pzwh5fb68zryqyss0hg9cbggxm15z15844w7svz")))) + "1qdz0yk5smi0dnywbxmanccwizilmnzgbbihjpmpgm6zjpn7xq3g")))) (build-system pyproject-build-system) (arguments (list @@ -561,8 +563,7 @@ def contents() -> str: ;; 'python-cryptography-rust', so there's no need ;; to build it here. (substitute* "pyproject.toml" - ((".*setuptools-rust.*") "")) - (delete-file "setup.py"))) + (("\\s+\\\"setuptools-rust.*") "")))) (add-before 'check 'symlink-rust-library (lambda* (#:key inputs outputs #:allow-other-keys) (symlink (search-input-file @@ -572,13 +573,12 @@ def contents() -> str: "_rust.abi3.so"))))))) (native-inputs - (list python-cryptography-vectors - python-hypothesis + (list python-certifi + python-cryptography-vectors python-iso8601 python-pretend python-pytest ;for subtests - python-pytest-benchmark - python-pytest-subtests)) + python-pytest-benchmark)) (inputs (list python-cryptography-rust)) (propagated-inputs (list python-cffi)) (home-page "https://github.com/pyca/cryptography") @@ -632,14 +632,15 @@ ciphers, message digests and key derivation functions.") #:cargo-inputs `(("rust-asn1" ,rust-asn1-0.15) ("rust-cc" ,rust-cc-1) + ("rust-cfg-if" ,rust-cfg-if-1) ("rust-foreign-types" ,rust-foreign-types-0.3) ("rust-foreign-types-shared" ,rust-foreign-types-shared-0.1) ("rust-once-cell" ,rust-once-cell-1) ("rust-openssl" ,rust-openssl-0.10) ("rust-openssl-sys" ,rust-openssl-sys-0.9) - ("rust-ouroboros" ,rust-ouroboros-0.15) - ("rust-pem" ,rust-pem-1) - ("rust-pyo3" ,rust-pyo3-0.18)))) + ("rust-pem" ,rust-pem-3) + ("rust-pyo3" ,rust-pyo3-0.20) + ("rust-self-cell" ,rust-self-cell-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. @@ -650,14 +651,14 @@ ciphers, message digests and key derivation functions.") (define-public python-pyopenssl (package (name "python-pyopenssl") - (version "23.2.0") + (version "24.1.0") (source (origin (method url-fetch) (uri (pypi-uri "pyOpenSSL" version)) (sha256 (base32 - "1b4bkcpzhmablf592g21rq3l8apbhklp6wcwlvgfflm4algr6vr7")))) + "0vqsyji1q4vhd5yxlzks0z6va62knq64mxhfdjhz3yaxmazx9gna")))) (build-system python-build-system) (arguments (list @@ -669,25 +670,21 @@ 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" "2023-03-25" "pytest" "-vv" "-k" - (string-append - ;; This test tries to look up certificates from - ;; the compiled-in default path in OpenSSL, which - ;; does not exist in the build environment. - "not test_fallback_default_verify_paths " - ;; This test attempts to make a connection to - ;; an external web service. - "and not test_set_default_verify_paths " - ;; Fails on i686-linux and possibly other 32-bit platforms - ;; https://github.com/pyca/pyopenssl/issues/974 - "and not test_verify_with_time")))))))) + (invoke "faketime" "2024-03-09" "pytest" "-vv" "-k" + ;; This test tries to look up certificates from + ;; the compiled-in default path in OpenSSL, which + ;; does not exist in the build environment. + "not test_fallback_default_verify_paths "))))))) (propagated-inputs (list python-cryptography)) (inputs (list openssl)) - (native-inputs (list libfaketime python-flaky python-pretend python-pytest)) + (native-inputs (list libfaketime python-pretend python-pytest + python-pytest-rerunfailures)) (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.") + (properties `((updater-extra-inputs . ("openssl")) + (updater-extra-native-inputs . ("libfaketime")))) (license license:asl2.0))) (define-public python-ed25519 diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index eef63351ef..94a0406ea7 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -65,6 +65,7 @@ ;;; Copyright © 2024 Sharlatan Hellseher <sharlatanus@gmail.com> ;;; Copyright © 2024 normally_js <normally_js@posteo.net> ;;; Copyright © 2024 Markku Korkeala <markku.korkeala@iki.fi> +;;; Copyright © 2024 Nguyễn Gia Phong <mcsinyx@disroot.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -83,6 +84,7 @@ (define-module (gnu packages python-web) #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix build-system cargo) #:use-module (guix build-system copy) #:use-module (guix build-system pyproject) #:use-module (guix build-system python) @@ -96,6 +98,8 @@ #:use-module (gnu packages bash) #:use-module (gnu packages check) #:use-module (gnu packages compression) + #:use-module (gnu packages crates-io) + #:use-module (gnu packages crates-web) #:use-module (gnu packages curl) #:use-module (gnu packages databases) #:use-module (gnu packages django) @@ -122,6 +126,7 @@ #:use-module (gnu packages qt) #:use-module (gnu packages rdf) #:use-module (gnu packages rpc) + #:use-module (gnu packages rust-apps) #:use-module (gnu packages serialization) #:use-module (gnu packages sphinx) #:use-module (gnu packages texinfo) @@ -3442,6 +3447,46 @@ verification of the SSL peer.") (home-page "https://github.com/cedadev/ndg_httpsclient/") (license license:bsd-3))) +(define-public python-nh3 + (package + (name "python-nh3") + (version "0.2.17") + (source + (origin + (method url-fetch) + (uri (pypi-uri "nh3" version)) + (sha256 + (base32 "0a7hrca5bbbrz20cbqy16n8vaxf4v2q1r9zv9vjlbmn334d79l20")))) + (build-system cargo-build-system) + (arguments + (list + #:imported-modules `(,@%cargo-build-system-modules + ,@%pyproject-build-system-modules) + #:modules '((guix build cargo-build-system) + ((guix build pyproject-build-system) #:prefix py:) + (guix build utils)) + #:phases + #~(modify-phases %standard-phases + (replace 'build (assoc-ref py:%standard-phases 'build)) + (replace 'install (assoc-ref py:%standard-phases 'install)) + ;; cargo-build-system's %standard-phases has 'check before 'install. + (delete 'check) + (add-after 'install 'check + (lambda* (#:key tests? inputs outputs #:allow-other-keys) + (when tests? + (py:add-installed-pythonpath inputs outputs) + (invoke "pytest" "-vv" "tests"))))) + #:cargo-inputs + `(("rust-ammonia" ,rust-ammonia-4) + ("rust-pyo3" ,rust-pyo3-0.21)) + #:install-source? #false)) + (native-inputs (list maturin python-pytest python-wrapper)) + (home-page "https://nh3.readthedocs.io") + (synopsis "Python bindings to Ammonia HTML sanitization library") + (description "This package provides Python bindings to Ammonia HTML +sanitizer Rust crate.") + (license license:expat))) + (define-public python-noiseprotocol (package (name "python-noiseprotocol") @@ -3606,13 +3651,13 @@ than Python’s urllib2 library.") (define-public python-requests-next (package (name "python-requests") - (version "2.31.0") + (version "2.32.3") (source (origin (method url-fetch) (uri (pypi-uri "requests" version)) (sha256 (base32 - "1qfidaynsrci4wymrw3srz8v1zy7xxpcna8sxpm91mwqixsmlb4l")))) + "0q5742pnibwy74169kacin3dmqg9jzmzk7qab5aq5caffcbm8djm")))) (build-system python-build-system) (propagated-inputs (list python-certifi @@ -6114,7 +6159,7 @@ event loop. It is implemented in Cython and uses libuv under the hood.") (base32 "1s7670qw36x90bgmazmgib170i5gnpyb2ypxzlla7y0mpasniag0")))) (outputs '("out" "doc")) - (build-system python-build-system) + (build-system pyproject-build-system) (arguments `(#:phases (modify-phases %standard-phases @@ -6164,6 +6209,7 @@ event loop. It is implemented in Cython and uses libuv under the hood.") ,(map (lambda (output) (string-append output sitedir)) (list python out)))))))))) + (inputs (list bash-minimal)) (native-inputs (list binutils ;; for ctypes.util.find_library() python-aiohttp @@ -6181,6 +6227,21 @@ various web frameworks, simply implemented, light on server resources, and fairly speedy.") (license license:expat))) +(define-public gunicorn-next + (package + (inherit gunicorn) + (name "gunicorn") + (version "22.0.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "gunicorn" version)) + (sha256 + (base32 + "0qzc3ghayc137hlwrqqwkkhaf8f5h9ja21qwy4rznxpz75i462sa")))) + ;; CVE-2024-1135 is fixed in version 22.0.0. + (properties `((lint-hidden-cve . ("CVE-2024-1135")))))) + ;; break cyclic dependency for python-aiohttp, which depends on gunicorn for ;; its tests (define-public gunicorn-bootstrap @@ -6981,15 +7042,24 @@ changed the process is restarted.") (define-public python-pyowm (package (name "python-pyowm") - (version "3.2.0") + (version "3.3.0") (source (origin - (method url-fetch) - (uri (pypi-uri "pyowm" version)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/csparpa/pyowm") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "1pm8w6phr4m3xayndfndid366vhf1fpvdgjsp2zicxarmgc0pm53")))) - (build-system python-build-system) - (propagated-inputs (list python-geojson python-pysocks python-requests)) + (base32 + "1ha4pp96y3jk33qnyir5851cnj4dc06q6wqn1b0w54l3fsds28vi")))) + (build-system pyproject-build-system) + (arguments (list #:test-flags #~(list "tests/unit"))) + (native-inputs (list python-pytest)) + (propagated-inputs + (list python-geojson-for-pyowm + python-pysocks + python-requests)) (home-page "https://github.com/csparpa/pyowm") (synopsis "Python wrapper around OpenWeatherMap web APIs") (description @@ -7399,7 +7469,7 @@ Encoding for HTTP.") (define-public python-cloud-init (package (name "python-cloud-init") - (version "23.4.3") + (version "24.2") (source (origin (method git-fetch) @@ -7408,7 +7478,7 @@ Encoding for HTTP.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0przjj2j1ws6b7sbgqxnffsarbbwl00lhq3bn7yiksp8kg8np1m1")))) + (base32 "18872z2y9wkh558y1bx5r0rksb4i584jbc8z4g8marwawhwxq506")))) (build-system pyproject-build-system) (arguments (list @@ -7422,6 +7492,7 @@ Encoding for HTTP.") (string-append ;; This test messes with PATH, so it cannot find mkdir "not test_path_env_gets_set_from_main" + " and not test_apt_configure_sources_list_" ;; These all fail because /bin/sh doesn't exist. We cannot patch ;; this because the generated scripts must use /bin/sh as they are ;; supposed to be run on minimal systems. @@ -7430,11 +7501,19 @@ Encoding for HTTP.") " and not test_subp_combined_stderr_stdout" " and not test_handle_part")) #:phases - '(modify-phases %standard-phases - (add-after 'unpack 'patch-references - (lambda _ - (substitute* "tests/unittests/cmd/test_clean.py" - (("#!/bin/sh") (string-append "#!" (which "sh"))))))))) + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-references + (lambda _ + (substitute* "tests/unittests/cmd/test_clean.py" + (("#!/bin/sh") (string-append "#!" (which "sh")))))) + (add-after 'install 'move-files + (lambda* (#:key inputs outputs #:allow-other-keys) + (for-each (lambda (dir) + (let ((source (string-append (site-packages inputs outputs) "/" dir)) + (target (string-append #$output "/" (basename dir)))) + (copy-recursively source target) + (delete-file-recursively source))) + (list "etc" "lib" "usr/lib" "usr/share"))))))) (propagated-inputs (list python-configobj python-jinja2 diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 36f75b4b40..d1b3882cd5 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -91,7 +91,7 @@ ;;; Copyright © 2020 Diego N. Barbato <dnbarbato@posteo.de> ;;; Copyright © 2020 Liliana Marie Prikler <liliana.prikler@gmail.com> ;;; Copyright © 2019 Kristian Trandem <kristian@devup.no> -;;; Copyright © 2020, 2021 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2020, 2021, 2024 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2020 EuAndreh <eu@euandre.org> ;;; Copyright © 2021, 2022 Morgan Smith <Morgan.J.Smith@outlook.com> ;;; Copyright © 2021-2024 Sharlatan Hellseher <sharlatanus@gmail.com> @@ -99,7 +99,7 @@ ;;; Copyright © 2021 LibreMiami <packaging-guix@libremiami.org> ;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz> ;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name> -;;; Copyright © 2021, 2023 jgart <jgart@dismail.de> +;;; Copyright © 2021, 2023-2024 jgart <jgart@dismail.de> ;;; Copyright © 2021 Danial Behzadi <dani.behzi@ubuntu.com> ;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be> ;;; Copyright © 2021 Hugo Lecomte <hugo.lecomte@inria.fr> @@ -153,6 +153,7 @@ ;;; Copyright © 2024 Navid Afkhami <navid.afkhami@mdc-berlin.de> ;;; Copyright © 2024 TakeV <takev@disroot.org> ;;; Copyright © 2024 David Elsing <david.elsing@posteo.net> +;;; Copyright © 2024 Rick Huijzer <ikbenrickhuyzer@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -199,6 +200,7 @@ #:use-module (gnu packages docker) #:use-module (gnu packages documentation) #:use-module (gnu packages elf) + #:use-module (gnu packages emulators) #:use-module (gnu packages enchant) #:use-module (gnu packages file) #:use-module (gnu packages fonts) @@ -2070,7 +2072,7 @@ task of adding retry behavior to just about anything.") (define-public python-pytelegrambotapi (package (name "python-pytelegrambotapi") - (version "3.7.4") + (version "4.21.0") (source (origin (method git-fetch) @@ -2079,21 +2081,21 @@ task of adding retry behavior to just about anything.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0r7g5zs0fk3g2dxvbpl0pi730x7r2kalrhn30fs0pvc15a59fmxz")))) - (build-system python-build-system) + (base32 "14df0mll9q8x4fka4lihmz4vdlgrvc4i13bspxnig2qz1b3k4ivv")))) + (build-system pyproject-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (with-directory-excursion "tests" - (invoke "py.test"))) - #t))))) + (list + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (with-directory-excursion "tests" + (invoke "py.test")))))))) (propagated-inputs (list python-requests)) (native-inputs - (list python-pytest)) + (list python-hatchling python-pytest)) (home-page "https://github.com/eternnoir/pyTelegramBotAPI") (synopsis "Python Telegram bot api") (description "This package provides a simple, but extensible Python @@ -2112,13 +2114,14 @@ implementation for the Telegram Bot API.") (base32 "1s7x0v872h8aks8xp01wmv6hzisxqjrh1svbbcycir0980h76krl")))) (build-system python-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda* (#:key inputs outputs tests? #:allow-other-keys) - (when tests? - (add-installed-pythonpath inputs outputs) - (invoke "python" "-m" "pytest"))))))) + (list + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key inputs outputs tests? #:allow-other-keys) + (when tests? + (add-installed-pythonpath inputs outputs) + (invoke "python" "-m" "pytest"))))))) (native-inputs (list python-pytest)) (home-page "https://github.com/borntyping/python-colorlog") @@ -2161,7 +2164,7 @@ of a loop structure or other iterative computation.") (arguments (list #:tests? #false)) ;there are none (propagated-inputs (list python-beautifulsoup4 - python-emoji + python-emoji-for-gh-md-to-html python-pillow python-requests python-shellescape @@ -7016,6 +7019,23 @@ format.") text styles of documentation.") (license license:asl2.0))) +(define-public python-pygdbmi + (package + (name "python-pygdbmi") + (version "0.11.0.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pygdbmi" version)) + (sha256 + (base32 "1c0z4snkjiyl1iq4m1k6liwg0b4pdv2as4bfyvcm0mpjzki6na3s")))) + (build-system pyproject-build-system) + (home-page "https://github.com/cs01/pygdbmi") + (synopsis "Parse gdb machine interface output with Python") + (description "This package provides a parse gdb machine interface output +with Python.") + (license license:expat))) + (define-public python-pygments (package (name "python-pygments") @@ -8919,59 +8939,6 @@ debugger, with which it shares the same interface.") @code{fsspec} for IPFS.") (license license:expat))) -(define-public python-pdbpp - ;; The latest release lacks support for Python 3.10; use the latest commit - ;; of the master branch (see: https://github.com/pdbpp/pdbpp/issues/503). - (let ((commit "e1c2e347cc55a6dd89e058e56a1366ada68884bc") - (revision "0")) - (package - (name "python-pdbpp") - (version (git-version "0.10.3" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/pdbpp/pdbpp") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1hql1ldwa9czml7zrnv6qdzgpywwav3a282dbvqypf108zvjsdiw")))) - (build-system python-build-system) - (arguments - (list - #:phases - #~(modify-phases %standard-phases - (add-before 'build 'pretend-version - (lambda _ - (setenv "SETUPTOOLS_SCM_PRETEND_VERSION" - #$(package-version this-package)))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "pytest" - "-k" - (string-append - ;; These tests seem to require a real TTY. - "not interaction_restores_previous_sigint_handler " - "and not python_m_pdb_uses_pdbpp")))))))) - (propagated-inputs - (list python-fancycompleter python-pygments python-wmctrl)) - (native-inputs - (list python-pytest python-setuptools-scm)) - (home-page "https://github.com/pdbpp/pdbpp") - (synopsis "Drop-in replacement for pdb") - (description "Pdb++ is a drop-in replacement for @code{pdb}. It -includes the following improvements compared to @code{pdb}: -@itemize -@item auto-completion -@item syntax highlighting of code listings -@item sticky mode -@item new commands to be used from the interactive (Pdb++) prompt -@item smart command parsing -@item additional convenience functions in the @code{pdb} module. -@end itemize") - (license license:bsd-3)))) - (define-public python-pdftotext (package (name "python-pdftotext") @@ -10061,6 +10028,28 @@ Storage or Compound Document, Microsoft Office). It is an improved version of the OleFileIO module from PIL, the Python Image Library.") (license license:bsd-3))) +(define-public python-property-cached + (package + (name "python-property-cached") + (version "1.6.4") + (source + (origin + (method url-fetch) + (uri (pypi-uri "property-cached" version ".zip")) + (sha256 + (base32 "0wxv5sdx1p7ils36j6j6hfscz8v2vzbq212i8y8r0lrnxpqlx71y")))) + (build-system pyproject-build-system) + (arguments + (list + ;; AssertionError. + #:test-flags #~(list "-k" "not test_threads_ttl_expiry"))) + (native-inputs (list python-freezegun python-pytest unzip)) + (home-page "https://github.com/althonos/property-cached/") + (synopsis "Decorator for caching properties in classes") + (description "This package provides a decorator for caching properties in +classes. It is forked from @code{cached-property}.") + (license license:bsd-3))) + (define-public python-pypdf3 (package (name "python-pypdf3") @@ -14150,30 +14139,40 @@ replacement for dictionaries where immutability is desired.") (define-public python-emoji (package (name "python-emoji") - (version "1.6.1") + (version "2.12.1") (source (origin (method url-fetch) (uri (pypi-uri "emoji" version)) (sha256 - (base32 "0923mpixwq6hdpkgvi4r46alfvf608iq975rb8lnqpq29j71mmjk")))) - (build-system python-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "python" "-m" "pytest"))))))) - (native-inputs - (list python-pytest)) + (base32 "1svk94pad8gcvjwd329zmfrw09wakwh6qjvnhf6sa6k92y44i82a")))) + (build-system pyproject-build-system) + (native-inputs (list python-pytest python-typing-extensions)) (home-page "https://github.com/carpedm20/emoji/") (synopsis "Emoji terminal output for Python") - (description "This package provides Emoji terminal output for Python. The + (description + "This package provides Emoji terminal output for Python. The entire set of Emoji codes as defined by the Unicode Consortium is supported in addition to a bunch of aliases.") (license license:bsd-3))) +;; TODO: Remove this package when upgrading python-gh-md-to-html to the +;; latest version. The latest gh-md-to-html does not build successfully from +;; the PyPI distribution. Let's resolve #72102 while keeping gh-md-to-html at +;; version 1.21.2 from failing. +;; https://issues.guix.gnu.org/72102 +;; https://github.com/phseiff/github-flavored-markdown-to-html/issues/73 +(define-public python-emoji-for-gh-md-to-html + (package + (inherit python-emoji) + (version "1.6.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "emoji" version)) + (sha256 + (base32 "0923mpixwq6hdpkgvi4r46alfvf608iq975rb8lnqpq29j71mmjk")))))) + (define-public python-sarge (package (name "python-sarge") @@ -16041,17 +16040,14 @@ Python code formatter \"black\".") (define-public python-geojson (package (name "python-geojson") - (version "2.5.0") + (version "3.1.0") (source (origin (method url-fetch) (uri (pypi-uri "geojson" version)) (sha256 - (base32 "12k5bzqskvq3gqzkryarhdjl0df47y5k9cf8r3clasi2wjnbfjvf")))) - (build-system python-build-system) - (arguments - ;; https://github.com/jazzband/geojson/issues/175 - `(#:tests? #f)) + (base32 "1b5df7skx3906046j12yjv8gdbcy17q9y3lbqbpmi83yf90gm9sq")))) + (build-system pyproject-build-system) (home-page "https://github.com/jazzband/geojson") (synopsis "Python bindings and utilities for GeoJSON") (description @@ -16060,6 +16056,21 @@ Python code formatter \"black\".") structures.") (license license:bsd-3))) +;; pyowm only accepts a version less than version 3. +(define-public python-geojson-for-pyowm + (package + (inherit python-geojson) + (version "2.5.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "geojson" version)) + (sha256 + (base32 "12k5bzqskvq3gqzkryarhdjl0df47y5k9cf8r3clasi2wjnbfjvf")))) + (arguments + ;; https://github.com/jazzband/geojson/issues/175 + (list #:tests? #f)))) + (define-public wfetch (let ((commit "e1cfa37814aebc9eb56ce994ebe877b6a6f9a715") (revision "1")) @@ -18454,45 +18465,24 @@ with a new public API, and RPython support.") (define-public python-hy (package (name "python-hy") - (version "0.28.0") + (version "0.29.0") (source (origin - (method git-fetch) ; no tests in PyPI release + (method git-fetch) ;no tests in PyPI release (uri (git-reference (url "https://github.com/hylang/hy") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0fs9ydqlbhmp4l3lf8ap8bksbpmlscm6gz7zf9bv2kmcldkjlzsw")))) - (build-system python-build-system) + (base32 "0fp5x94hyckjfap2pb1rj551a3q70vrljxark7hj9kdhr7prbggi")))) + (build-system pyproject-build-system) (arguments (list - #:phases - #~(modify-phases %standard-phases - ;; Hy includes a script that writes a version.py file that Hy uses to - ;; report its version. That script uses information from the git - ;; repository or the HY_VERSION environment variable. Therefore, - ;; these phases set HY_VERSION and then remove the support scripts - ;; which get installed in the root of the output. - (add-after 'unpack 'set-version - (lambda _ - (setenv "HY_VERSION" #$version))) - (add-after 'install 'remove-installed-build-scripts - (lambda _ - (delete-file-recursively (string-append #$output "/get_version")))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "python" "-m" "pytest" "-k" - (string-append ; skip some failed tests - "not test_sys_executable" - " and not test_circular_macro_require" - " and not test_macro_require" - " and not test_requires_pollutes_core")))))))) - (native-inputs - (list python-pytest-next python-wheel)) - (propagated-inputs - (list python-funcparserlib)) + ;; This test expects the hy executable to be called 'hy', but in Guix + ;; it's .hy-real. + #:test-flags #~(list "-k" "not test_sys_executable"))) + (native-inputs (list python-pytest-next python-wheel)) + (propagated-inputs (list python-funcparserlib)) (home-page "https://docs.hylang.org/en/stable/") (synopsis "Lisp frontend to Python") (description @@ -19264,16 +19254,19 @@ templates into Python modules.") (define-public python-waitress (package (name "python-waitress") - (version "1.1.0") + (version "3.0.0") (source (origin (method url-fetch) (uri (pypi-uri "waitress" version)) - (patches (search-patches "python-waitress-fix-tests.patch")) (sha256 (base32 - "1a85gyji0kajc3p0s1pwwfm06w4wfxjkvvl4rnrz3h164kbd6g6k")))) - (build-system python-build-system) + "18dq4bibsv6cfhv6a3b16w2xwycxqkkiwbb0vpcwsd21n1ws8p80")))) + (build-system pyproject-build-system) + (arguments + ;; https://github.com/Pylons/waitress/issues/443 + (list #:test-flags #~(list "-k" "not test_service_port"))) + (native-inputs (list python-pytest python-pytest-cov)) (home-page "https://github.com/Pylons/waitress") (synopsis "Waitress WSGI server") (description "Waitress is meant to be a production-quality pure-Python WSGI @@ -20017,7 +20010,7 @@ encoding algorithms to do fuzzy string matching.") (define-public python-pdfminer-six (package (name "python-pdfminer-six") - (version "20201018") + (version "20231228") ;; There are no tests in the PyPI tarball. (source (origin @@ -20027,23 +20020,19 @@ encoding algorithms to do fuzzy string matching.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1a2fxxnnjqbx344znpvx7cnv1881dk6585ibw01inhfq3w6yj2lr")))) - (build-system python-build-system) + (base32 "1anyr0gm7amwls8qifflql1viz5rq6q95lfwcg43v3180h4w8wrd")))) + (build-system pyproject-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - ;; Tests write to the source tree. - (add-after 'unpack 'make-git-checkout-writable - (lambda _ - (for-each make-file-writable (find-files ".")) - #t)) - (replace 'check - (lambda _ - (invoke "make" "test")))))) + (list #:phases + #~(modify-phases %standard-phases + ;; Tests write to the source tree. + (add-after 'unpack 'make-git-checkout-writable + (lambda _ + (for-each make-file-writable (find-files "."))))))) (propagated-inputs - (list python-chardet python-cryptography python-sortedcontainers)) + (list python-charset-normalizer python-cryptography)) (native-inputs - (list python-nose python-tox)) + (list python-pytest)) (home-page "https://github.com/pdfminer/pdfminer.six") (synopsis "PDF parser and analyzer") (description "@code{pdfminer.six} is a community maintained fork of @@ -23331,23 +23320,32 @@ efficient as possible on all supported Python versions.") Mustache templating language renderer.") (license license:expat))) +;; XXX: Try to inherit from duckdb and build from source with all extentions. (define-public python-duckdb (package (name "python-duckdb") - (version "0.8.1") + (version "1.0.0") (source (origin (method url-fetch) (uri (pypi-uri "duckdb" version)) (sha256 (base32 - "1sgfmii5xlkbx3hzyjxg80gl2ni1rxpabahl4gww9by2mgs3fkd5")))) + "0lyl6di1c7j31i2mk384j711kzyyf9rjd3nqx5mbgmf7gfvmk852")))) (build-system pyproject-build-system) (arguments (list #:test-flags - '(list "--ignore=tests/slow/test_h2oai_arrow.py" - ;; Don't install anything, thank you. - "-k" "not test_install_non_existent_extension") + #~(list "--ignore=tests/slow/test_h2oai_arrow.py" + ;; Do not relay on mypy. + "--ignore=tests/stubs/test_stubs.py" + "-k" (string-append + ;; Don't install anything, thank you. + "not test_install_non_existent_extension" + ;; See <https://github.com/duckdb/duckdb/issues/11961>. + " and not test_fetchmany" + ;; See <https://github.com/duckdb/duckdb/issues/10702>. + " and not test_connection_interrupt" + " and not test_query_interruption")) #:phases #~(modify-phases %standard-phases ;; Tests need this @@ -23366,11 +23364,12 @@ Mustache templating language renderer.") "pyfilesystem.hpp" "pybind11/conversions/pyconnection_default.hpp") (("const_name") "_")))))))) + (propagated-inputs + (list python-adbc-driver-manager)) (native-inputs (list pybind11 python-fsspec python-google-cloud-storage - python-mypy python-numpy python-pandas python-psutil @@ -24736,6 +24735,35 @@ manipulation, or @code{stdout}.") and integration into other projects.") (license license:asl2.0)))) +(define-public python-sacn + (package + (name "python-sacn") + (version "1.10.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "sacn" version)) + (sha256 + (base32 "02pqfwwx83lgb8nj9p0s6vyi1s7wjgbx9k0bzlyz8qapszzdsr37")))) + (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)) + (home-page "https://github.com/Hundemeier/sacn") + (synopsis + "Python library for sending and receiving sACN data") + (description + "This package provides a Python library for sending and receiving + sACN (Streaming Architecture for Control Networks) data, a standard + protocol used for controlling lighting and other devices over + a network.") + (license license:expat))) + (define-public python-bagit (package (name "python-bagit") @@ -26316,6 +26344,7 @@ source bytes using the UTF-8 encoding and then rewrites Python 3.6 style @code{f} strings.") (license license:expat))) +;; TODO: https://github.com/python/typed_ast/issues/179 (define-public python-typed-ast (package (name "python-typed-ast") @@ -26331,11 +26360,12 @@ source bytes using the UTF-8 encoding and then rewrites Python 3.6 style (file-name (git-file-name name version)))) (build-system python-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda _ - (invoke "pytest")))))) + (list #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "pytest" "-vv"))))))) (native-inputs (list python-pytest)) (home-page "https://github.com/python/typed_ast") (synopsis "Fork of Python @code{ast} modules with type comment support") @@ -33804,6 +33834,382 @@ instructions up to AVX-512 and SHA (including 3dnow!+, XOP, FMA3, FMA4, TBM and BMI2).") (license license:bsd-2)))) +(define-public python-ailment + (package + (name "python-ailment") + ;; Must be the same version as python-angr. + (version "9.2.46") + (source + (origin + (method url-fetch) + (uri (pypi-uri "ailment" version)) + (sha256 + (base32 "073fcssbjis1ckwv2w0dcz2dfl6715bj4d4qdhspajj911mvng2f")))) + (build-system pyproject-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (replace 'check + ;; Many tests are skipped due to cyclic dependencies. + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (with-directory-excursion "tests" + (invoke "python" "-m" "unittest")))))))) + (home-page "https://github.com/angr/ailment") + (synopsis "The angr intermediate language") + (description + "This Python module implements an @acronym{IL, Intermediate Language}, +also known as @acronym{IR, Intermediate Representation}, used by the angr +binary analysis platform.") + (license license:bsd-2))) + +(define-public python-cle + (package + (name "python-cle") + ;; Must be the same version as python-angr. + (version "9.2.46") + (source + (origin + (method url-fetch) + (uri (pypi-uri "cle" version)) + (sha256 + (base32 "0mswv9gd2p2ws7zfsshqv5ybbj27wkdwakdcknq4vsrx9ry9k4yc")))) + (build-system pyproject-build-system) + (arguments + (list + #:tests? #f)) + (propagated-inputs (list python-pefile python-pyelftools python-pyvex + python-sortedcontainers)) + (native-inputs (list python-cffi)) + (home-page "https://github.com/angr/cle") + (synopsis "Python loader for binaries and their associated libraries") + (description + "CLE loads binaries and their associated libraries, resolves +imports and provides an abstraction of process memory the same way as if +it was loader by the operating system's loader.") + (license license:bsd-2))) + +(define-public python-pyvex + (package + (name "python-pyvex") + ;; Must be the same version as python-angr. + (version "9.2.46") + (source + (origin + (method url-fetch) + (patches (search-patches "python-pyvex-remove-angr-dependency.patch")) + (uri (pypi-uri "pyvex" version)) + (sha256 + (base32 "1v64rn7gxy6fg065bgsy38z6r494k5ri5r6sn4g08hjj32ihx1ka")))) + (build-system pyproject-build-system) + (arguments + (list + #:phases #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (with-directory-excursion "tests" + (invoke "python" "-m" "unittest"))))) + + (add-before 'build 'set-cc + (lambda _ + (setenv "CC" #$(cc-for-target)) + (setenv "CC_NATIVE" "gcc")))))) + (propagated-inputs (list python-archinfo python-bitstring python-cffi)) + (home-page "https://github.com/angr/pyvex") + (synopsis "Python interface to libVEX and VEX IR") + (description + "This package provides a Python interface the libVEX and VEX IR. +VEX is the intermediate representation (also known as intermediate +language) used by the Valgrind analysis tool. As such, VEX is designed +to enable all kinds of binary analysis tasks.") + (license license:bsd-2))) + +(define-public python-claripy + (package + (name "python-claripy") + ;; Must be the same version as python-angr. + (version "9.2.46") + (source + (origin + ;; Fetching from Git as pypi release doesn't include all test files. + (method git-fetch) + (uri (git-reference + (url "https://github.com/angr/claripy") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0nmawpi1596d9plafrp2db36cjsidy2fagkzkja51jwlx2m1ngai")) + (modules '((guix build utils))) + (snippet '(begin + (substitute* "setup.cfg" + ;; Relax the z3 version constraint. + ;; See https://github.com/angr/claripy/commit/d1fe2df + (("z3-solver==4.10.2.0") + "")))))) + (build-system pyproject-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (with-directory-excursion "tests" + (invoke "python" "-m" "unittest")))))))) + (propagated-inputs (list python-cachetools python-decorator python-pysmt + z3)) + (home-page "https://github.com/angr/claripy") + (synopsis "Abstraction layer for constraint solvers") + (description + "This Python module provides an abstraction layer for interacting +with constraint solvers. Specifically, it is intended to be used with +SMT solvers and is built on top of the Z3 solver.") + (license license:bsd-2))) + +(define-public python-pysmt + (package + (name "python-pysmt") + (version "0.9.5") + (source + (origin + ;; Fetching from Git as pypi release doesn't include all test files. + (method git-fetch) + (patches (search-patches "python-pysmt-fix-pow-return-type.patch" + "python-pysmt-fix-smtlib-serialization-test.patch")) + (uri (git-reference + (url "https://github.com/pysmt/pysmt") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0hrxv23y5ip4ijfx5pvbwc2fq4zg9jz42wc9zqgqm0g0mjc9ckvh")))) + (build-system pyproject-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (add-before 'check 'set-pysmt-solver + (lambda _ + (setenv "PYSMT_SOLVER" "z3")))))) + (native-inputs (list python-pytest)) + (propagated-inputs (list z3)) + (home-page "https://github.com/pysmt/pysmt") + (synopsis + "Solver-agnostic library for SMT formula manipulation and solving") + (description + "This Python module provides a solver-agnostic abstraction for +working with @acronym{SMT, Satisfiability Modulo Theory} formulas. For example, +it allows manipulation and solving such formulas.") + (license license:asl2.0))) + +(define-public python-rpyc + (package + (name "python-rpyc") + (version "5.3.1") + (source + (origin + ;; Fetching from Git as pypi release doesn't include all test files. + (method git-fetch) + (uri (git-reference + (url "https://github.com/tomerfiliba-org/rpyc") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "15mnp9qkyw3mmxmr5y4kf3xkvxyp00n892vqaqwznr7al35apgnr")) + (snippet '(begin + ;; Disable deploy tests, these rely on OpenSSH and require + ;; configuring the SSH client manually to accept the host key. + (delete-file "tests/test_deploy.py") + ;; Disable tests requiring network access. These tests + ;; presently fail with the error "Network is unreachable". + (delete-file "tests/test_registry.py"))))) + (build-system pyproject-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (with-directory-excursion "tests" + (invoke "python" "-m" "unittest")))))))) + (propagated-inputs (list python-hatchling python-plumbum)) + (home-page "https://github.com/tomerfiliba-org/rpyc") + (synopsis + "Remote Python Call (RPyC) is a symmetric distributed computing library") + (description + "This Python module enables remote procedure calls, clustering, and +distributed-computing. For this purpose, it makes use of object-proxying, a technique +that employs python's dynamic nature, to overcome the physical boundaries between +processes and computers, so that remote objects can be manipulated as if they +were local.") + (license license:expat))) + +(define-public python-nampa + (package + (name "python-nampa") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "nampa" version)) + (sha256 + (base32 "0k6cq2gflpkm40qhgqbbcjmq5lq589c15bmk567qyh3d08062hvd")))) + (build-system pyproject-build-system) + (propagated-inputs (list python-future)) + (home-page "https://github.com/thebabush/nampa") + (synopsis "Python implementation of IDA Pro's FLIRT technology") + (description + "This Python module implements the @acronym{FLIRT, Fast Library Identification +and Recognition Technology}. This technology is useful for identifying +common library subroutines in disassembled binaries.") + (license license:lgpl3))) + +(define-public python-mulpyplexer + (package + (name "python-mulpyplexer") + (version "0.09") + (source + (origin + (method url-fetch) + (uri (pypi-uri "mulpyplexer" version)) + (sha256 + (base32 "0c5xzci1djy1yi9hxxh8g67l6ms8r7ad7ja20pv8hfbdysdrwkhl")))) + (build-system pyproject-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "python" "mulpyplexer.py"))))))) + (home-page "https://github.com/zardus/mulpyplexer/") + (synopsis "Multiplexes interactions with lists of Python objects") + (description "This module provides utilities for multiplexing +interactions with lists of Python objects.") + (license license:bsd-2))) + +(define-public python-itanium-demangler + (package + (name "python-itanium-demangler") + (version "1.1") + (source + (origin + (method git-fetch) + (uri (git-reference + ;; PyPI only provides wheels and no source code. + (url "https://github.com/whitequark/python-itanium_demangler") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1q47aqm5z3db6pasdzw05d6236vnb8hnapfy88fcmn9dr5ym98r3")))) + (build-system pyproject-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (with-directory-excursion "tests" + (invoke "python" "-m" "unittest")))))))) + (home-page "https://github.com/whitequark/python-itanium_demangler/") + (synopsis "Pure Python Itanium C++ ABI demangler") + (description +"This Python module provides an implementation of the Itanium C++ ABI symbol +mangling language. The demangler generates an abstract syntax tree from +mangled symbols, which can be used for directly extracting type information.") + (license license:bsd-0))) + +(define-public python-angr + (package + (name "python-angr") + (version "9.2.46") + (source + (origin + ;; Fetching from Git as pypi release doesn't include all test files. + (method git-fetch) + (patches (search-patches "python-angr-addition-type-error.patch" + "python-angr-check-exec-deps.patch")) + (uri (git-reference + (url "https://github.com/angr/angr") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "18y9wyf7va7gvp9zd6lhw82j9a2x2ajsvbawh96xnxzml0jwlwjm")))) + (build-system pyproject-build-system) + (arguments + (list + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'patch-tests + (lambda* (#:key inputs #:allow-other-keys) + (let ((coreutils (assoc-ref inputs "coreutils"))) + (substitute* "tests/test_vault.py" + (("/bin/false") + (which "false"))) + (substitute* "tests/common.py" + (("\\[\"cc\"\\]") + "[\"gcc\"]"))))) + (replace 'check + (lambda* (#:key inputs tests? #:allow-other-keys) + (when tests? + (copy-recursively #$(this-package-native-input "binaries") + "../binaries") + (with-directory-excursion "tests" + ;; test_mips32_missing_offset_in_instructions fails + ;; with capstone 5 and passes with capstone 4. Might + ;; be a capstone regressions, needs investigation. + ;; + ;; test_concrete_memset is a non-deterministic benchmark. + (invoke "pytest" "-vv" "-x" "--dist" "loadfile" + "-k" "not test_mips32_missing_offset_in_instructions and not test_concrete_memset" + "-n" (number->string (parallel-job-count))))))) + (add-before 'build 'set-cc + (lambda _ + (setenv "CC" "gcc")))))) + (propagated-inputs (list python-ailment + python-archinfo + python-cachetools + python-cffi + python-claripy + python-cle + python-colorama + python-cppheaderparser + python-dpkt + python-gitpython + python-mulpyplexer + python-nampa + python-networkx + python-protobuf + python-psutil + python-itanium-demangler + python-pycparser + python-pyvex + python-progressbar2 + python-rpyc + python-sortedcontainers + python-sqlalchemy + python-sympy + unicorn)) + (native-inputs `(("python-pytest" ,python-pytest) + ("python-pytest-xdist" ,python-pytest-xdist) + ("binaries" + ;; This repository ships several binaries used only for testing + ;; purpose. The binaries are not executed and not part of the + ;; angr distribution, they are only used to test angr's binary + ;; analysis capabilities. In the context of the GNU FSDG, these + ;; files should be considered non-functional data. + ,(origin + (method git-fetch) + (uri (git-reference (url + "https://github.com/angr/binaries") + (commit (string-append "v" + version)))) + (file-name (git-file-name "angr-binaries" version)) + (sha256 (base32 + "1f286b2239zavxzwg1184hj1zs380cr9qr549mvy3vywvm8bsmgr")))))) + (home-page "https://github.com/angr/angr") + (synopsis "Multi-architecture binary analysis toolkit") + (description + "This package provides a versatile binary analysis platform with the +ability to perform dynamic symbolic execution as well as various +static analyses directly on binaries. As such, it can be used for all +kinds of reverse engineering, vulnerability discovery, exploit +generation, and software testing purposes.") + (license license:bsd-2))) + (define-public python-peachpy ;; There is no tag in this repo. (let ((commit "913d74c35a6b1d330e90bfc055208ce5b06b35a0") @@ -37099,6 +37505,48 @@ write text fast, and for various text generation, statistics, and modeling tasks (base32 "0mikjfvq26kh8asnn9v55z41pap4c5ypymqnwwi4xkavc3mzyda2")))))) +(define-public python-xmp-toolkit + (package + (name "python-xmp-toolkit") + (version "2.0.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "python-xmp-toolkit" version)) + (sha256 + (base32 "12x6lyaxjpbl8ll3cj97039kwvsha2nkx2v8v8irfbi2p0dl721s")) + (patches (search-patches + "python-xmp-toolkit-add-missing-error-codes.patch")))) + (build-system pyproject-build-system) + (arguments + (list + #:test-flags + #~(list "-k" (string-append "not test_can_put_xmp and " + "not test_exempi_bad_combinations and " + "not test_formats and " + "not test_get_xmp and " + "not test_open_file_with_options")) + #:phases + #~(modify-phases %standard-phases + (add-before 'build 'configure-environment + (lambda* (#:key outputs inputs #:allow-other-keys) + (let ((exempi #$(this-package-input "exempi"))) + (setenv "LD_LIBRARY_PATH" + (string-append exempi "/lib")))))))) + (inputs (list exempi)) + (propagated-inputs (list python-pytz)) + (native-inputs (list python-pytest)) + (home-page "https://github.com/python-xmp-toolkit/python-xmp-toolkit") + (synopsis "Python XMP Toolkit for working with metadata.") + (description "Python XMP Toolkit is a library for working with XMP +metadata, as well as reading/writing XMP metadata stored in many different +file formats. + +Python XMP Toolkit is wrapping Exempi (using ctypes), a C/C++ XMP library +based on Adobe XMP Toolkit, ensuring that future updates to the XMP standard +are easily incorporated into the library with a minimum amount of work.") + (license license:bsd-3))) + ;;; ;;; 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 diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 1074c29063..c150dca78b 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -140,7 +140,7 @@ (define-public qcoro-qt5 (package (name "qcoro-qt5") - (version "0.9.0") + (version "0.10.0") (source (origin (method git-fetch) @@ -149,11 +149,14 @@ (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0pk5ybk6zv7m0wnkl6m3m8sjybmfk6wcn22mmgj942hrc3yrdzci")))) + (base32 "0inhjc9zknc64q6gajkljfpm2287arg1j0848ia3rhqcbc53k28b")))) (build-system qt-build-system) (arguments (list #:configure-flags - #~(list "-DUSE_QT_VERSION=5"))) + #~(list (string-append "-DUSE_QT_VERSION=" + #$(version-major + (package-version + (this-package-input "qtbase"))))))) (native-inputs (list dbus)) ;for tests (inputs (list qtbase-5 qtdeclarative-5 qtwebsockets-5)) (home-page "https://qcoro.dvratil.cz/") @@ -162,6 +165,16 @@ of C++20 coroutines in connection with certain asynchronous Qt actions.") (license license:expat))) +(define-public qcoro-qt6 + (package + (inherit qcoro-qt5) + (name "qcoro-qt6") + (inputs (modify-inputs (package-inputs qcoro-qt5) + (replace "qtbase" qtbase) + (replace "qtdeclarative" qtdeclarative) + (replace "qtwebsockets" qtwebsockets) + (append libxkbcommon))))) + (define-public qmdnsengine ;; Used as submodule in https://github.com/moonlight-stream/moonlight-qt (let ((commit "b7a5a9f225d5e14b39f9fd1f905c4f505cf2ee99") @@ -256,7 +269,7 @@ window managers, that don't provide Qt integration by themselves.") (define-public kddockwidgets (package (name "kddockwidgets") - (version "2.0.0") + (version "2.1.0") (source (origin (method git-fetch) (uri (git-reference @@ -265,17 +278,18 @@ window managers, that don't provide Qt integration by themselves.") (file-name (git-file-name name version)) (sha256 (base32 - "1fcmfz9my3219r0kh2y8yfvq372pd65z4s6hm0js7j8qb47lr02p")))) + "0s4s0y8kvkyf15d5kzcd5wik7n1jj9mxrmc60irlacfy93hmdaw0")))) (build-system cmake-build-system) - (arguments (list #:configure-flags #~(list "-DKDDockWidgets_TESTS=ON"))) + (arguments (list #:configure-flags #~(list + "-DKDDockWidgets_QT6=ON" + "-DKDDockWidgets_TESTS=ON"))) (inputs (list fmt nlohmann-json - qtbase-5 - qtdeclarative-5 - qtquickcontrols2-5 - qtx11extras - spdlog)) + qtbase + qtdeclarative + spdlog + libxkbcommon)) (home-page "https://github.com/KDAB/KDDockWidgets") (synopsis "KDAB's Dock Widget Framework for Qt") (description "KDDockWidgets is a Qt dock widget library suitable for @@ -2261,7 +2275,7 @@ native APIs where it makes sense."))) Server Protocol (LSP) for Qt.") (license (package-license qtbase)))) -(define-public qtlocation +(define-public qtlocation-5 (package (inherit qtsvg-5) (name "qtlocation") @@ -2286,6 +2300,32 @@ Server Protocol (LSP) for Qt.") (description "The Qt Location module provides an interface for location, positioning and geolocation plugins."))) +(define-public qtlocation + (package + (inherit qtsvg) + (name "qtlocation") + (version "6.6.3") + (source (origin + (method url-fetch) + (uri (qt-url name version)) + (sha256 + (base32 + "1l81z3zq1zg015l6qxx4yzssdspw689m9bpzxp23yshaych2kd6p")))) + (arguments + (substitute-keyword-arguments (package-arguments qtsvg) + ((#: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)) + (inputs (list icu4c openssl qtbase zlib qtdeclarative qtpositioning + libxkbcommon)) + (synopsis "Qt Location and Positioning modules") + (description "The Qt Location module provides an interface for location, +positioning and geolocation plugins."))) + (define-public qtlottie (package (name "qtlottie") @@ -2605,8 +2645,18 @@ also contains functionality to support data models and executable content.") (add-after 'install 'delete-installed-tests (lambda _ (delete-file-recursively - (string-append #$output "/tests"))))))) - (inputs (list perl qtbase)) + (string-append #$output "/tests")))) + (delete 'check) ;move after the install phase + (add-after 'install 'check + (assoc-ref %standard-phases 'check)) + (add-before 'check 'check-setup + (lambda _ + (setenv "QML_IMPORT_PATH" + (string-append #$output "/lib/qt6/qml:" + (getenv "QML_IMPORT_PATH"))) + ;; Make Qt render "offscreen", required for tests. + (setenv "QT_QPA_PLATFORM" "offscreen")))))) + (inputs (list perl qtbase qtdeclarative qtserialport libxkbcommon)) (home-page (package-home-page qtbase)) (synopsis "QML and C++ positioning information API") (description "The Qt Positioning API provides positioning information via @@ -3938,7 +3988,7 @@ module provides support functions to the automatically generated code.") ("qtbase" ,qtbase-5) ("qtconnectivity" ,qtconnectivity) ("qtdeclarative-5" ,qtdeclarative-5) - ("qtlocation" ,qtlocation) + ("qtlocation" ,qtlocation-5) ("qtmultimedia-5" ,qtmultimedia-5) ("qtsensors" ,qtsensors-5) ("qtserialport" ,qtserialport-5) @@ -4318,17 +4368,17 @@ This package provides the Python bindings."))) (define-public qtkeychain (package (name "qtkeychain") - (version "0.13.2") + (version "0.14.3") (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/frankosterfeld/qtkeychain/") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1zk6r2vc1q48qs7mw2h47bpgrfbb9r7lf9cwq4sb1a4nls87zznk")))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/frankosterfeld/qtkeychain/") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1li40ka0g8v2f1q01gpabpx264wmk5zrv2961sg3byj70kf9fmgv")))) (build-system cmake-build-system) (native-inputs (list pkg-config qttools-5)) @@ -4341,15 +4391,38 @@ This package provides the Python bindings."))) (add-before 'configure 'set-qt-trans-dir (lambda _ (substitute* "CMakeLists.txt" - (("\\$\\{qt_translations_dir\\}") - "${CMAKE_INSTALL_PREFIX}/share/qt5/translations"))))))) + (("\\$\\{qt_translations_dir\\}") + "${CMAKE_INSTALL_PREFIX}/share/qt5/translations"))))))) (home-page "https://github.com/frankosterfeld/qtkeychain") (synopsis "Qt API to store passwords") (description - "QtKeychain is a Qt library to store passwords and other secret data + "QtKeychain is a Qt library to store passwords and other secret data securely. It will not store any data unencrypted unless explicitly requested.") (license license:bsd-3))) +(define-public qtkeychain-qt6 + (package + (inherit qtkeychain) + (name "qtkeychain-qt6") + (native-inputs + (modify-inputs (package-native-inputs qtkeychain) + (replace "qttools" qttools))) + (inputs + (modify-inputs (package-inputs qtkeychain) + (replace "qtbase" qtbase))) + (arguments + (substitute-keyword-arguments (package-arguments qtkeychain) + ((#:configure-flags flags #~(list)) + #~(cons "-DBUILD_WITH_QT6=ON" #$flags)) + ((#:phases phases '%standard-phases) + #~(modify-phases #$phases + (replace 'set-qt-trans-dir + (lambda _ + (lambda _ + (substitute* "CMakeLists.txt" + (("\\$\\{qt_translations_dir\\}") + "${CMAKE_INSTALL_PREFIX}/share/qt6/translations"))))))))))) + (define-public qtsolutions (let ((commit "9568abd142d581b67b86a5f63d823a34b0612702") (revision "53")) @@ -4775,7 +4848,7 @@ color-related widgets.") (list qtbase-5 qtdatavis3d qtdeclarative-5 - qtlocation + qtlocation-5 qtmultimedia-5 qtquickcontrols-5 qtquickcontrols2-5 @@ -5141,10 +5214,36 @@ protocol. The DBusMenu protocol makes it possible for applications to export and import their menus over DBus.") (license license:lgpl2.1+))) +(define-public kdsingleapplication + (package + (name "kdsingleapplication") + (version "1.1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/KDAB/KDSingleApplication") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1w7wg9w4mifrkpn7hhw1nnnwh1vhnf8i4wgfxvh44nacwslbwsb2")))) + (build-system qt-build-system) + (arguments + (list + #:qtbase qtbase + #:configure-flags + #~(list "-DKDSingleApplication_QT6=true" "-DKDSingleApplication_TESTS=true"))) + (inputs (list libxkbcommon vulkan-headers)) + (home-page "https://github.com/KDAB/KDSingleApplication") + (synopsis "Qt helper class for single-instance policy applications") + (description "KD SingleApplication is a helper class for single-instance +policy applications.") + (license (list license:bsd-3 license:expat)))) + (define-public kdsoap (package (name "kdsoap") - (version "2.0.0") + (version "2.2.0") (source (origin (method url-fetch) @@ -5152,18 +5251,18 @@ and import their menus over DBus.") "kdsoap-" version "/kdsoap-" version ".tar.gz")) (sha256 (base32 - "1vh4rzb09kks1ilay1y60q7gf64gwzdwsca60hmx1xx69w8672fi")))) + "0mpkg9iyvzb6mxvhbi6zc052ids2r2nzpmjbljgpq6a2hja13vyr")))) (build-system qt-build-system) - (inputs `(("qtbase" ,qtbase-5))) + (inputs (list qtbase-5)) (arguments - '(#:configure-flags '("-DKDSoap_TESTS=true") - #:phases - (modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "ctest" "-E" ;; These tests try connect to the internet. - "(kdsoap-webcalls|kdsoap-webcalls_wsdl|kdsoap-test_calc)"))))))) + (list #:configure-flags #~(list "-DKDSoap_TESTS=true") + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "ctest" "-E" ;; These tests try connect to the internet. + "(kdsoap-test_webcalls|kdsoap-test_webcalls_wsdl|kdsoap-test_calc)"))))))) (home-page "https://www.kdab.com/development-resources/qt-tools/kd-soap/") (synopsis "Qt SOAP component") (description "KD SOAP is a tool for creating client applications for web @@ -5171,10 +5270,20 @@ services using the XML based SOAP protocol and without the need for a dedicated web server.") (license (list license:gpl2 license:gpl3)))) +(define-public kdsoap-qt6 + (package + (inherit kdsoap) + (name "kdsoap-qt6") + (arguments (substitute-keyword-arguments (package-arguments kdsoap) + ((#:configure-flags flags #~(list)) + #~(cons "-DKDSoap_QT6=true" #$flags)))) + (inputs (modify-inputs (package-inputs kdsoap) + (replace "qtbase" qtbase))))) + (define-public libaccounts-qt (package (name "libaccounts-qt") - (version "1.16") + (version "1.17") (source (origin (method git-fetch) (uri (git-reference @@ -5183,7 +5292,7 @@ web server.") (file-name (git-file-name name version)) (sha256 (base32 - "1vmpjvysm0ld8dqnx8msa15hlhrkny02cqycsh4k2azrnijg0xjz")))) + "0859nsksgfrj6ynj74awj1fr6slwcjavs989xc7mbgpvi87n1xlq")))) (build-system gnu-build-system) (arguments (list #:tests? #f ;TODO @@ -5212,6 +5321,15 @@ handles the authentication process of an account and securely stores the credentials and service-specific settings.") (license license:lgpl2.1+))) +(define-public libaccounts-qt6 + (package + (inherit libaccounts-qt) + (name "libaccounts-qt6") + (native-inputs (modify-inputs (package-native-inputs libaccounts-qt) + (replace "qtbase" qtbase) + (replace "qttools" qttools))) + (synopsis "Qt6 bindings for libaccounts-glib"))) + (define-public libsignon-glib (package (name "libsignon-glib") @@ -5261,16 +5379,16 @@ GLib applications.") (define-public packagekit-qt5 (package (name "packagekit-qt5") - (version "1.0.2") + (version "1.1.1") (source (origin (method git-fetch) - (uri (git-reference - (url "https://github.com/hughsie/PackageKit-Qt") - (commit (string-append "v" version)))) + (uri (git-reference + (url "https://github.com/hughsie/PackageKit-Qt") + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "1d20r503msw1vix3nb6a8bmdqld7fj8k9jk33bkqsc610a2zsms6")))) + "0bajp6lxc9gdn7sy7rs7hwkhx854k5kqr3w9v07mv9l6vwnwq057")))) (build-system cmake-build-system) (arguments '(#:tests? #f)) ;no test suite (native-inputs (list pkg-config)) @@ -5282,6 +5400,20 @@ abstraction layer that allows the session user to manage packages in a secure way.") (license license:lgpl2.1+))) +(define-public packagekit-qt6 + (package + (inherit packagekit-qt5) + (name "packagekit-qt6") + (arguments (substitute-keyword-arguments (package-arguments packagekit-qt5) + ((#:configure-flags flags #~'()) + #~(cons "-DBUILD_WITH_QT6=ON" #$flags)))) + (inputs (modify-inputs (package-inputs packagekit-qt5) + (replace "qtbase" qtbase))) + (synopsis "Qt6 bindings for PackageKit") + (description "Provides Qt6 bindings to PackageKit which is a DBUS +abstraction layer that allows the session user to manage packages in +a secure way."))) + (define-public signond (package (name "signond") @@ -5328,6 +5460,31 @@ a secure way.") authentication on behalf of its clients.") (license license:lgpl2.1+))) +;; fork for support qt6 +(define-public signond-qt6 + (let ((commit "c8ad98249af541514ff7a81634d3295e712f1a39") + (revision "0")) + (package + (inherit signond) + (name "signond-qt6") + (version (git-version "8.61" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/nicolasfella/signond") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "13cgdf6hhi2z3c8sax79dwi7450n8h228kpyl2w5lx0xglb2savq")))) + (native-inputs (modify-inputs (package-native-inputs signond) + (delete "qtbase") + (replace "qttools" qttools))) + (arguments + (substitute-keyword-arguments (package-arguments signond) + ((#:qtbase _ #f) + qtbase)))))) + (define-public signon-plugin-oauth2 (package (name "signon-plugin-oauth2") diff --git a/gnu/packages/racket.scm b/gnu/packages/racket.scm index 2b20353159..f43a314983 100644 --- a/gnu/packages/racket.scm +++ b/gnu/packages/racket.scm @@ -201,7 +201,7 @@ ;; ;; CODE: -(define %racket-version "8.12") ; Remember to update chez-scheme-for-racket! +(define %racket-version "8.13") ; Remember to update chez-scheme-for-racket! (define %racket-commit (string-append "v" %racket-version)) (define %racket-origin @@ -211,10 +211,9 @@ (url "https://github.com/racket/racket") (commit %racket-commit))) (sha256 - (base32 "1f52yadmrsd2ddry47s68kxig185a58n19j23458wkck19nawjz5")) + (base32 "0pf9lmch7bz3gs4dbn2qb7mraxzjfiz50aij9zsli9jc022ybqb9")) (file-name (git-file-name "racket" %racket-version)) (patches (search-patches "racket-chez-scheme-bin-sh.patch" - "racket-backport-8.12-chez-configure.patch" "racket-rktio-bin-sh.patch")) (modules '((guix build utils))) (snippet @@ -243,7 +242,7 @@ (define-public zuo (package (name "zuo") - (version "1.9") ; defined in racket/src/zuo/zuo.c or the following + (version "1.10") ; defined in racket/src/zuo/zuo.c or the following #;(displayln (~a (hash-ref (runtime-env) 'version) "." (hash-ref (runtime-env) 'minor-version))) (source (origin @@ -252,7 +251,7 @@ (url "https://github.com/racket/zuo") (commit (string-append "v" version)))) (sha256 - (base32 "0zasir33nx1qi1ciz9dn6h8k39i443lr6apw5d1i6mjmhpzxmdhp")) + (base32 "007bjbhxbw3dq75klaa6f6ljhri2qxi43q6n74wyy50vr9yhx4s1")) (file-name (git-file-name name version)) (patches (search-patches "zuo-bin-sh.patch")))) (outputs '("out" "debug")) @@ -709,7 +708,7 @@ DrRacket IDE, are not included.") "contract-profile" (base32 "1xm2z8g0dpv5d9h2sg680vx1a8ix9gbsdpxxb8qv1w7akp73paj3") '(("contract-profile" "."))) (simple-racket-origin - "data" (base32 "01sinnsnjiazvkj83k84izdnp38pd2aglbrs14mrdkwajgmpampk") + "data" (base32 "11ai6c9h0brbblc6xn045ajj4gyrvbjpk1pqcqm1m0dy9q2rzd4a") '("data" "data-doc" "data-enumerate-lib" "data-lib")) (simple-racket-origin "datalog" (base32 "0nf6cy4djpyhfvgpa6yn72apbz9s83gp0qg95pzjd0az4v6qwq1s") @@ -718,7 +717,7 @@ DrRacket IDE, are not included.") "db" (base32 "0xx0k8yw2vb9b4vk2dwjfbpixnmriqsv7kpv3fvfxbwyg42y0db5") '("db" "db-doc" "db-lib")) (simple-racket-origin - "deinprogramm" (base32 "0f41sh90i4mml95x2gcmfvl2rc7m77vjbagmgjx270ng7xvz16lj") + "deinprogramm" (base32 "05l643h1mc4v7jhs4fq7yi84zl24nk1zx6ld07a6zgn85kik3vzb") '("deinprogramm" "deinprogramm-signature")) (simple-racket-origin "distributed-places" (base32 "1dajpkj9balqcpv6cdk9hwjz592h1vq8rrx5vncariiac4vbdpa0") @@ -727,7 +726,7 @@ DrRacket IDE, are not included.") "draw" (base32 "1h7mckay8yjcgmj3r0jkf1csn430gn43n8jl1l956q9gcprlmncl") '("draw" "draw-doc" "draw-lib")) (simple-racket-origin - "drracket" (base32 "17bdbvsf5l8z96bwzg1q75gg70c6svbhw0g1k239fsjd3mivmki4") + "drracket" (base32 "155qzbg2jg5kbv580z30z4w1ac3p527ixk0daan86wkgpl0lxnzn") '("drracket" "drracket-plugin-lib" "drracket-tool" @@ -741,13 +740,13 @@ DrRacket IDE, are not included.") "eli-tester" (base32 "0icx6wn14gjm8kdmq1jppqgq87sxkras4qb5xmdr6wigxafhjqyk") '(("eli-tester" "."))) (simple-racket-origin - "eopl" (base32 "1n8lzvhggp6bp2hg4n51zg8f4ya10isb92pfzngss2ch7299zfj2") + "eopl" (base32 "0qihajdpwf2q7hbs6fsw6mmmzy57kgzgry3vyp9z8w7ay8df3w15") '(("eopl" "."))) (simple-racket-origin "errortrace" (base32 "0l9k2rx6z4jkid7kxhbs763s66pxbzvfrgxajykbrmqkv77lhb3w") '("errortrace" "errortrace-doc" "errortrace-lib")) (simple-racket-origin - "expeditor" (base32 "10841c60nxqvwnjn6f9c6dcp4vsqbvi7n8nvi59vjk7d3b2qfpbq") + "expeditor" (base32 "0m9ga4scg49pbv60gnl0ky5al72012psa4dfgnkzq0bnf5lwwm2i") '("expeditor" "expeditor-doc" "expeditor-lib")) (simple-racket-origin "frtime" (base32 "0ydz2yn8vvv6z7brwlswcyx0f31a6y6d443i89rysfvd2xkhpfd5") @@ -761,13 +760,13 @@ DrRacket IDE, are not included.") "games" (base32 "13z7fnbr48s98lmfxc0nbfhbqkd4hphymy2r63hqm783xzn6ylzi") '(("games" "."))) (simple-racket-origin - "gui" (base32 "08kzyscqc8hgc1f8q0bhibl44fkq8iiyz12f8bqdhqkcz8nx44sw") + "gui" (base32 "1vz3h9mwmycl9sbx19dsfkx5sqh71nwv360g80khwyvnsx99fxfs") '("gui" "gui-doc" "gui-lib" "tex-table")) (simple-racket-origin "gui-pkg-manager" (base32 "1ji9448d723nklqvycwdswj0ni28sabrncag14f9mx47did5myb5") '("gui-pkg-manager-lib")) (simple-racket-origin - "htdp" (base32 "13d8xsvs60d7797w93g14dbdm98bixgy65akayij256pyiwnqwdc") + "htdp" (base32 "0z58askwixx0vh99dmpbjvv099hkhykgnlgfs679vxbjcnfwafd6") '("htdp" "htdp-doc" "htdp-lib")) (simple-racket-origin "html" (base32 "18n1jnjgzfknc8nv8dppi85nb8q08gqdwkg6hfjk08x0p00anx2x") @@ -791,7 +790,7 @@ DrRacket IDE, are not included.") "make" (base32 "10852fj30bz5r46c3d99s37fkgy5yh44gb01j29sf3kxnhi0g2sa") '(("make" "."))) (simple-racket-origin - "math" (base32 "1l0r4xpbbjz0b2s6v3kn490zgs2q1dnj3ga95y1505jmcwgb2hl9") + "math" (base32 "03ybjcp1w38f539dzsh8qb5cw0mb2hslpyqwbcsqxj3l9vqjlm8y") '("math" "math-doc" "math-lib")) (simple-racket-origin "mysterx" (base32 "11p9jzrafw0hizhl0cs4sxx7rv281185q8hryic2rpk0kzjdyr48") @@ -809,7 +808,7 @@ DrRacket IDE, are not included.") (url "https://github.com/RenaissanceBug/racket-cookies") (commit %racket-commit))) (sha256 (base32 - "1zr31y1gqa3kkrwlf9bnw08nzij00x1l70qhfbpz0239bksn4mmb")) + "1fbl717w5801bydx3nzwxddd1rh1cc0gxwpjc7ka9zh5ak09sb0w")) (file-name (git-file-name "RenaissanceBug-racket-cookies" %racket-version))) '("net-cookies" "net-cookies-doc" "net-cookies-lib")) @@ -826,7 +825,7 @@ DrRacket IDE, are not included.") (git-file-name "stamourv-optimization-coach" %racket-version))) '(("optimization-coach" "."))) (simple-racket-origin - "option-contract" (base32 "07cncg9pi15cm19k7rzv54vx83wq7y42i2m6bgzaqja1h8vnj2ww") + "option-contract" (base32 "1914dcxy6qzpg3cpnzdm9lj0kwyw8xdb85mwiamqfkbg0xlyyhpa") '("option-contract" "option-contract-doc" "option-contract-lib")) (simple-racket-origin "parser-tools" (base32 "1lp7wixmxcnha7cz834xfqqr48c2nldjbn9lng69bihpw01h9zms") @@ -835,7 +834,7 @@ DrRacket IDE, are not included.") "pconvert" (base32 "00czi0p399mmyrvxyrs5kniizpkqfxyz2ncxqi2jy79a7wk79pb1") '("pconvert-lib")) (simple-racket-origin - "pict" (base32 "1ghds5by8i0k2djbig82xqp2ssy3nvdwm45l8ibsr99y0ay6z7gv") + "pict" (base32 "1swnwihfnbsz9k11515i0fbfhx1gn7qcygn1dxkrdvb89g4h1pf3") '("pict" "pict-doc" "pict-lib")) (simple-racket-origin "pict-snip" (base32 "081nwiy4a0n4f7xws16hqbhf0j3kz5alizndi3nnyr3chm4kng6x") @@ -844,13 +843,13 @@ DrRacket IDE, are not included.") "picturing-programs" (base32 "1g6xr39hx1j03gb3d4dljm3v91xcj2gfpq3dgy5xvplzr6cmmxgr") '(("picturing-programs" "."))) (simple-racket-origin - "plai" (base32 "18kz31pj4lanlf9mn2yc0q9sxis264wb4f9v85ga23wd7g1hrzbq") + "plai" (base32 "1vcplmrzk2wr0n0m4fa0nq9ir986d5nk3dvcd7h1rv2jvhkcqdaq") '("plai" "plai-doc" "plai-lib")) (simple-racket-origin "planet" (base32 "0r2yqrzrmdjjyr14k6hhlzc5kzrcx3583m1s02mhrcmpfw0s85w9") '("planet" "planet-doc" "planet-lib")) (simple-racket-origin - "plot" (base32 "0jq9a366g7b2c9vp6yvpqikvklgyd6p4xj6v224g99yj8cgip40b") + "plot" (base32 "0skmir4njxmh3yx3ng23dvwkal79dd3fd23ijk6lyk8b013w1kj2") '("plot" "plot-compat" "plot-doc" "plot-gui-lib" "plot-lib")) (simple-racket-origin "preprocessor" (base32 "1p5aid58ifnjy4xl0ysh85cq39k25661v975jrpk182z3k5621mg") @@ -889,7 +888,7 @@ DrRacket IDE, are not included.") "racklog" (base32 "0fr8xij0sssfnmwn6dfdi4jj3l62f2yj3jrjljv13kaycrfls032") '(("racklog" "."))) (simple-racket-origin - "rackunit" (base32 "06kpl51alm7akgmmh110ya28zgmx3as0szykfv2gwqmf7xcms1b7") + "rackunit" (base32 "18s2rg5y5i68m83z3b81dwv6ixm67iyv3varm9azmnr7di0gflzj") '("rackunit" "rackunit-doc" "rackunit-gui" @@ -905,7 +904,7 @@ DrRacket IDE, are not included.") "realm" (base32 "0rlvwyd6rpyl0zda4a5p8dp346fvqzc8555dgfnrhliymkxb6x4g") '(("realm" "."))) (simple-racket-origin - "redex" (base32 "1mwnxbfk2vbalndlq0996rzdi3a2z48m5xnb1ywzlsvnydrnkrk2") + "redex" (base32 "083ql7xx7slnpvyr0a8z2wdyib84lh155frjx8gmcisri5895z28") '("redex" "redex-benchmark" "redex-doc" @@ -920,7 +919,7 @@ DrRacket IDE, are not included.") "scheme-lib" (base32 "0pcf0y8rp4qyjhaz5ww5sr5diq0wpcdfrrnask7zapyklzx1jx8x") '(("scheme-lib" "."))) (simple-racket-origin - "scribble" (base32 "0rk5q9r9fw826ag0npk5cwkzkapj2p243wwm9gn2l7j7cr6z1rvb") + "scribble" (base32 "03sgcgq8s0dk2zbn4jm514lx720rdx2pj8plr0sy7j0wnvm3rzsi") '("scribble" "scribble-doc" "scribble-html-lib" @@ -949,10 +948,10 @@ DrRacket IDE, are not included.") "slideshow" (base32 "147s7si6lxx6hm84wk2rfplk6wprladl9zni9pdvaxfa25chrabf") '("slideshow" "slideshow-doc" "slideshow-exe" "slideshow-lib" "slideshow-plugin")) (simple-racket-origin - "snip" (base32 "1b90ccqilnyszbphms3svm3c7dbk7870ifybjjipss5srb32mj2d") + "snip" (base32 "1aikzimkxvdvf81jxacm2zm8xir7nx1j6l6539pywl3xaf3nb2fm") '("snip" "snip-lib")) (simple-racket-origin - "typed-racket" (base32 "0vdsyr0qhpvac6h8mfdy6vqrsqsfa7kpg39n3h637hccxyfxv63f") + "typed-racket" (base32 "1r746jaxi5xxrk2zsn6v7bhb0drnlf7nx1ni0lvf7mvhqw7f97ci") '("source-syntax" "typed-racket" "typed-racket-compatibility" @@ -960,7 +959,7 @@ DrRacket IDE, are not included.") "typed-racket-lib" "typed-racket-more")) (simple-racket-origin - "srfi" (base32 "1l3nr3a8mlp505aaxlyp4i8jfijmpyl9h1wwv8hzm4kzzjv4sl8p") + "srfi" (base32 "0z7kchsz9m6cb4qmbznzqs2px45fz1g81amg9zn7n1sa31x3jzch") '("srfi" "srfi-doc" "srfi-lib" "srfi-lite-lib")) (simple-racket-origin "string-constants" (base32 "0225f1wmq1n9f2x1pg50fssdnd4bpc11q1jgsykwf4ik4fnaa520") @@ -978,7 +977,7 @@ DrRacket IDE, are not included.") "unix-socket" (base32 "02dfwas5ynbpyz74w9kwb4wgb37y5wys7svrlmir8k0n9ph9vq0y") '("unix-socket" "unix-socket-doc" "unix-socket-lib")) (simple-racket-origin - "web-server" (base32 "1i4sxmcgj00ml7czsbyx1433hgf091n1p54xyal2f1fsskx5fg0y") + "web-server" (base32 "0wpsgdz38zxjrs4kazad71dl9y11cvn6jj4fz2maba77021byzyn") '("web-server" "web-server-doc" "web-server-lib")) (simple-racket-origin "wxme" (base32 "1qp5gr9gqsakiq3alw6m4yyv5vw4i3hp4y4nhq8vl2nkjmirvn0b") diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index db8b2c9de6..502b04495a 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -2670,7 +2670,7 @@ voice formats.") qtcharts qtdeclarative-5 qtgamepad - qtlocation + qtlocation-5 qtmultimedia-5 qtquickcontrols2-5 qtserialport-5 @@ -3260,7 +3260,7 @@ memory contents between them.") (substitute* "lib/CMakeLists.txt" (("(DESTINATION \")/etc/udev/" _ directive) (string-append directive #$output "/lib/udev/")))))))) - (inputs (list libusb qtbase-5 qtlocation qtserialport-5 yaml-cpp)) + (inputs (list libusb qtbase-5 qtlocation-5 qtserialport-5 yaml-cpp)) (native-inputs (list qttools-5)) (home-page "https://dm3mat.darc.de/qdmr/") (synopsis "GUI application and command line tool to program DMR radios") diff --git a/gnu/packages/rdesktop.scm b/gnu/packages/rdesktop.scm index 254ba4d06b..eb17fa929c 100644 --- a/gnu/packages/rdesktop.scm +++ b/gnu/packages/rdesktop.scm @@ -168,7 +168,7 @@ of parts of the Windows API.") (define-public xrdp (package (name "xrdp") - (version "0.9.23.1") + (version "0.10.0") (source (origin (method url-fetch) (uri (string-append @@ -176,7 +176,7 @@ of parts of the Windows API.") version "/xrdp-" version ".tar.gz")) (sha256 (base32 - "1jpmwywzb6law2hrzm94qy2hgivs7izc2ci0w2h9yxn2j1mizdwg")))) + "1nakn842p759xxd9713335ms3h8dmr33xbmylnbk2j03m4dhvlnx")))) (build-system gnu-build-system) (inputs (list check fuse-2 @@ -196,6 +196,7 @@ of parts of the Windows API.") python python-libxml2)) (native-inputs (list bison + cmocka flex gettext-minimal intltool diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index d73bd1a030..7de25356c7 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2020 Leo Famulari <leo@famulari.name> ;;; Copyright © 2020 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2020 Gabriel Arazas <foo.dogsquared@gmail.com> -;;; Copyright © 2020-2023 Nicolas Goaziou <mail@nicolasgoaziou.fr> +;;; Copyright © 2020-2024 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2020 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2021 Sharlatan Hellseher <sharlatanus@gmail.ccom> @@ -112,7 +112,12 @@ (uri (crate-uri "aardvark-dns" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0ldqv9v3v9a1m2kka660d5v15y2zasy5z7m4fh5hif74r089cx6x")))) + (base32 "0ldqv9v3v9a1m2kka660d5v15y2zasy5z7m4fh5hif74r089cx6x")) + (modules '((guix build utils))) + (snippet + '(begin (substitute* (find-files "." "^Cargo\\.toml$") + (("\"~([[:digit:]]+(\\.[[:digit:]]+)*)" _ version) + (string-append "\"^" version))))))) (build-system cargo-build-system) (arguments `(#:install-source? #f @@ -139,20 +144,20 @@ (define-public agate (package (name "agate") - (version "3.2.4") + (version "3.3.5") (source (origin (method url-fetch) (uri (crate-uri "agate" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1wvbhzm4k3hdy8x7aq8rj3galhgfizdwf5fi419hzvg3kmvbawh1")))) + (base32 "0ja2lvlcvkcbjn8r9da4k0ppy7pb7xad8j4b0a4fhg0mbp244f9s")))) (build-system cargo-build-system) (arguments `(#:install-source? #f #:cargo-inputs (("rust-configparser" ,rust-configparser-3) - ("rust-env-logger" ,rust-env-logger-0.9) + ("rust-env-logger" ,rust-env-logger-0.11) ("rust-futures-util" ,rust-futures-util-0.3) ("rust-getopts" ,rust-getopts-0.2) ("rust-glob" ,rust-glob-0.3) @@ -160,12 +165,10 @@ ("rust-mime-guess" ,rust-mime-guess-2) ("rust-once-cell" ,rust-once-cell-1) ("rust-percent-encoding" ,rust-percent-encoding-2) - ("rust-rcgen" ,rust-rcgen-0.9) - ("rust-rustls" ,rust-rustls-0.20) + ("rust-rcgen" ,rust-rcgen-0.12) ("rust-tokio" ,rust-tokio-1) - ("rust-tokio-rustls" ,rust-tokio-rustls-0.23) - ("rust-url" ,rust-url-2) - ("rust-webpki" ,rust-webpki-0.22)) + ("rust-tokio-rustls" ,rust-tokio-rustls-0.25) + ("rust-url" ,rust-url-2)) #:cargo-development-inputs (("rust-anyhow" ,rust-anyhow-1) ("rust-gemini-fetch" ,rust-gemini-fetch-0.2)))) (home-page "https://github.com/mbrubeck/agate") @@ -359,27 +362,28 @@ paging.") (define-public cargo-machete (package (name "cargo-machete") - (version "0.6.0") + (version "0.6.1") (source (origin (method url-fetch) (uri (crate-uri name version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0lbymfxgcizmj1c1ydpzinjbjhc7c9j0wb5y1xq33j80s5hzayaz")))) + (base32 "1an8d88njnk8hfsnwnx52zlzdmijscv7m20as1ci986rxz3vgpcl")))) (build-system cargo-build-system) (arguments `(#:tests? #f ;Error: No such file or directory (os error 2) + #:install-source? #f #:cargo-inputs (("rust-anyhow" ,rust-anyhow-1) ("rust-argh" ,rust-argh-0.1) ("rust-cargo-metadata" ,rust-cargo-metadata-0.18) - ("rust-cargo-toml" ,rust-cargo-toml-0.16) - ("rust-grep" ,rust-grep-0.2) + ("rust-cargo-toml" ,rust-cargo-toml-0.19) + ("rust-grep" ,rust-grep-0.3) ("rust-log" ,rust-log-0.4) ("rust-pretty-env-logger" ,rust-pretty-env-logger-0.5) ("rust-rayon" ,rust-rayon-1) ("rust-serde" ,rust-serde-1) - ("rust-toml-edit" ,rust-toml-edit-0.20) + ("rust-toml-edit" ,rust-toml-edit-0.22) ("rust-walkdir" ,rust-walkdir-2)))) (home-page "https://github.com/est31/cargo-udeps") (synopsis "Find unused dependencies in Cargo.toml") @@ -542,22 +546,63 @@ Features include: configuration instructions.") (license license:expat))) +(define-public evremap + (let ((commit "cc618e8b973f5c6f66682d1477b3b868a768c545")) ;version bump + (package + (name "evremap") + (version "0.1.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/wez/evremap") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "182ry573q8kjsxx2hvxk9d6clahpll1vh50zvs5g652jd6a2f038")))) + (build-system cargo-build-system) + (arguments + (list #:cargo-inputs `(("rust-anyhow" ,rust-anyhow-1) + ("rust-clap" ,rust-clap-4) + ("rust-env-logger" ,rust-env-logger-0.11) + ("rust-evdev-rs" ,rust-evdev-rs-0.6) + ("rust-libc" ,rust-libc-0.2) + ("rust-log" ,rust-log-0.4) + ("rust-serde" ,rust-serde-1) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-toml" ,rust-toml-0.8)))) + (native-inputs (list pkg-config)) + (inputs (list libevdev)) + (home-page "https://github.com/wez/evremap") + (synopsis "Keyboard input remappper") + (description + "Evremap is a keyboard input remapper. It works by grabbing exclusive +access to an input device and maintaining a model of the keys that are +pressed. It then applies your remapping configuration to produce the +effective set of pressed keys and emits appropriate changes to a virtual +output device. + +Its remapping is effective system-wide: in Wayland, X11 and the Linux +console.") + (license license:expat)))) + (define-public eza (package (name "eza") - (version "0.17.0") + (version "0.18.7") (source (origin (method url-fetch) (uri (crate-uri "eza" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "026xagh42nrdy2yg9197mmb2bhm5mdvbf9vd9fk9iysrj1iay63r")))) + (base32 "1wnkbzaza0bcw5rld3baikpwwvnajz3j6nbpaic5mhv86rshqlcq")))) (build-system cargo-build-system) (arguments (list #:install-source? #f - #:cargo-inputs `(("rust-ansiterm" ,rust-ansiterm-0.12) + #:cargo-inputs `(("rust-ansi-width" ,rust-ansi-width-0.1) + ("rust-ansiterm" ,rust-ansiterm-0.12) ("rust-chrono" ,rust-chrono-0.4) ("rust-git2" ,rust-git2-0.18) ("rust-glob" ,rust-glob-0.3) @@ -565,24 +610,24 @@ configuration instructions.") ("rust-locale" ,rust-locale-0.2) ("rust-log" ,rust-log-0.4) ("rust-natord" ,rust-natord-1) - ("rust-num-cpus" ,rust-num-cpus-1) ("rust-number-prefix" ,rust-number-prefix-0.4) ("rust-once-cell" ,rust-once-cell-1) ("rust-palette" ,rust-palette-0.7) + ("rust-path-clean" ,rust-path-clean-1) ("rust-percent-encoding" ,rust-percent-encoding-2) ("rust-phf" ,rust-phf-0.11) ("rust-plist" ,rust-plist-1) ("rust-proc-mounts" ,rust-proc-mounts-0.3) - ("rust-scoped-threadpool" ,rust-scoped-threadpool-0.1) + ("rust-rayon" ,rust-rayon-1) ("rust-terminal-size" ,rust-terminal-size-0.3) ("rust-timeago" ,rust-timeago-0.4) ("rust-unicode-width" ,rust-unicode-width-0.1) - ("rust-uutils-term-grid" ,rust-uutils-term-grid-0.3) + ("rust-uutils-term-grid" ,rust-uutils-term-grid-0.6) ("rust-uzers" ,rust-uzers-0.11) ("rust-windows-sys" ,rust-windows-sys-0.52) ("rust-zoneinfo-compiled" ,rust-zoneinfo-compiled-0.5)) #:cargo-development-inputs `(("rust-criterion" ,rust-criterion-0.5) - ("rust-trycmd" ,rust-trycmd-0.14)) + ("rust-trycmd" ,rust-trycmd-0.15)) #:phases #~(modify-phases %standard-phases (add-after 'build 'build-manual (lambda* (#:key inputs #:allow-other-keys) @@ -594,7 +639,9 @@ configuration instructions.") "-f" "markdown" "-t" "man" (string-append "man/" page ".md"))))) - (list "eza.1" "eza_colors.5"))))) + (list "eza.1" + "eza_colors.5" + "eza_colors-explanation.5"))))) (add-after 'install 'install-extras (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -611,6 +658,8 @@ configuration instructions.") (install-file "eza.1" man1)) (when (file-exists? "eza_colors.5") (install-file "eza_colors.5" man5)) + (when (file-exists? "eza_colors-explanation.5") + (install-file "eza_colors-explanation.5" man5)) (mkdir-p bash-completions-dir) (mkdir-p zsh-completions-dir) (mkdir-p fish-completions-dir) @@ -723,6 +772,89 @@ While it does not seek to mirror all of find's powerful functionality, it provid defaults for 80% of the use cases.") (license (list license:expat license:asl2.0)))) +(define-public gitui + (package + (name "gitui") + (version "0.25.2") + (source + (origin + (method url-fetch) + (uri (crate-uri "gitui" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "19xv6bvp0hs1m5y8a0myifvh8xrxrv14wd4gknlsrka0l7d8ijg7")))) + (build-system cargo-build-system) + (arguments + `(;; disable vendor-openssl from default flags + ;; use oniguruma regex lib which is faster and makes gitui 25% smaller + #:features '("ghemoji" "regex-onig" "trace-libgit") + #:cargo-build-flags + '("--release" "--no-default-features") + #:cargo-test-flags + '("--release" "--no-default-features" + "--features" "ghemoji regex-onig trace-libgit" + "--" + ;; this test fails with permission denied error + "--skip=test_symbolic_links") + #:install-source? #f + #:phases + (modify-phases %standard-phases + (replace 'install + ;; Add --no-default-features to the install phase. + (lambda* (#:key outputs features #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (invoke "cargo" "install" "--no-track" + "--path" "." + "--root" out + "--no-default-features" + "--features" (string-join features)))))) + #:cargo-inputs (("rust-anyhow" ,rust-anyhow-1) + ("rust-asyncgit" ,rust-asyncgit-0.25) + ("rust-backtrace" ,rust-backtrace-0.3) + ("rust-bitflags" ,rust-bitflags-2) + ("rust-bugreport" ,rust-bugreport-0.5) + ("rust-bwrap" ,rust-bwrap-1) + ("rust-bytesize" ,rust-bytesize-1) + ("rust-chrono" ,rust-chrono-0.4) + ("rust-clap" ,rust-clap-4) + ("rust-crossbeam-channel" ,rust-crossbeam-channel-0.5) + ("rust-crossterm" ,rust-crossterm-0.27) + ("rust-dirs" ,rust-dirs-5) + ("rust-easy-cast" ,rust-easy-cast-0.5) + ("rust-filetreelist" ,rust-filetreelist-0.5) + ("rust-fuzzy-matcher" ,rust-fuzzy-matcher-0.3) + ("rust-gh-emoji" ,rust-gh-emoji-1) + ("rust-indexmap" ,rust-indexmap-2) + ("rust-itertools" ,rust-itertools-0.12) + ("rust-log" ,rust-log-0.4) + ("rust-notify" ,rust-notify-6) + ("rust-notify-debouncer-mini" ,rust-notify-debouncer-mini-0.4) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-ratatui" ,rust-ratatui-0.24) + ("rust-rayon-core" ,rust-rayon-core-1) + ("rust-ron" ,rust-ron-0.8) + ("rust-scopeguard" ,rust-scopeguard-1) + ("rust-scopetime" ,rust-scopetime-0.1) + ("rust-serde" ,rust-serde-1) + ("rust-shellexpand" ,rust-shellexpand-3) + ("rust-simplelog" ,rust-simplelog-0.12) + ("rust-struct-patch" ,rust-struct-patch-0.4) + ("rust-syntect" ,rust-syntect-5) + ("rust-tui-textarea" ,rust-tui-textarea-0.4) + ("rust-unicode-segmentation" ,rust-unicode-segmentation-1) + ("rust-unicode-truncate" ,rust-unicode-truncate-0.2) + ("rust-unicode-width" ,rust-unicode-width-0.1) + ("rust-which" ,rust-which-6)) + #:cargo-development-inputs + (("rust-pretty-assertions" ,rust-pretty-assertions-1) + ("rust-tempfile" ,rust-tempfile-3)))) + (native-inputs (list pkg-config)) + (inputs (list libgit2-1.7 libssh2 openssl zlib)) + (home-page "https://github.com/extrawurst/gitui") + (synopsis "Terminal UI for git") + (description "This package provides a fast Terminal UI for git.") + (license license:expat))) + (define-public hexyl (package (name "hexyl") @@ -1366,7 +1498,12 @@ on the terminal in a visually appealing way.") (uri (crate-uri "netavark" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1viyj9xqq9hkcsghrfx7wjmky3hkxfr96952f9favd4zg9ih64yw")))) + (base32 "1viyj9xqq9hkcsghrfx7wjmky3hkxfr96952f9favd4zg9ih64yw")) + (modules '((guix build utils))) + (snippet + '(begin (substitute* (find-files "." "^Cargo\\.toml$") + (("\"~([[:digit:]]+(\\.[[:digit:]]+)*)" _ version) + (string-append "\"^" version))))))) (build-system cargo-build-system) (arguments `(#:install-source? #f @@ -2043,22 +2180,24 @@ of support files.") (define-public treefmt (package (name "treefmt") - (version "0.4.1") + (version "0.6.1") (source (origin (method url-fetch) (uri (crate-uri "treefmt" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1rarg6rffzl1cf6r167h9p14wr696kwnzr85kwbdy7x7x5zpj5li")))) + (base32 "1pfx8kgaf0rc8ijps2fqb61gjnak3sf430hvg52bnby9qqyd51h8")))) (build-system cargo-build-system) (arguments `(#:install-source? #f #:cargo-inputs (("rust-anyhow" ,rust-anyhow-1) + ("rust-clap" ,rust-clap-4) + ("rust-clap-verbosity-flag" ,rust-clap-verbosity-flag-2) ("rust-console" ,rust-console-0.13) ("rust-directories" ,rust-directories-3) + ("rust-env-logger" ,rust-env-logger-0.10) ("rust-filetime" ,rust-filetime-0.2) ("rust-globset" ,rust-globset-0.4) ("rust-ignore" ,rust-ignore-0.4) @@ -2068,12 +2207,12 @@ of support files.") ("rust-serde" ,rust-serde-1) ("rust-serde-json" ,rust-serde-json-1) ("rust-sha-1" ,rust-sha-1-0.9) - ("rust-structopt" ,rust-structopt-0.3) ("rust-tempfile" ,rust-tempfile-3) ("rust-toml" ,rust-toml-0.5) ("rust-which" ,rust-which-4)) #:cargo-development-inputs - (("rust-criterion" ,rust-criterion-0.3)))) + (("rust-criterion" ,rust-criterion-0.3) + ("rust-mockall" ,rust-mockall-0.11)))) (home-page "https://numtide.github.io/treefmt") (synopsis "Command-line application to format the code tree") (description @@ -2405,19 +2544,20 @@ background agent taking care of maintaining the necessary state.") (define-public rust-cargo (package (name "rust-cargo") - (version "0.76.0") + (version "0.78.1") (source (origin (method url-fetch) (uri (crate-uri "cargo" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "14yjyvj9bl6mlzx6bbi3igflgdrx1hil9ifnf1dl9xnm4mb2gjw6")))) + (base32 "1p6564hg38xxbpjiiqxmnm1kmysxfjh0kbm5g56n85c3s0wmwc6n")))) (build-system cargo-build-system) (arguments `(#:tests? #f ; unresolved import `cargo_test_support` #:cargo-inputs - (("rust-anstream" ,rust-anstream-0.6) + (("rust-annotate-snippets" ,rust-annotate-snippets-0.10) + ("rust-anstream" ,rust-anstream-0.6) ("rust-anstyle" ,rust-anstyle-1) ("rust-anyhow" ,rust-anyhow-1) ("rust-base64" ,rust-base64-0.21) @@ -2428,18 +2568,18 @@ background agent taking care of maintaining the necessary state.") ("rust-cargo-credential-wincred" ,rust-cargo-credential-wincred-0.4) ("rust-cargo-platform" ,rust-cargo-platform-0.1) ("rust-cargo-util" ,rust-cargo-util-0.2) + ("rust-cargo-util-schemas" ,rust-cargo-util-schemas-0.2) ("rust-clap" ,rust-clap-4) ("rust-color-print" ,rust-color-print-0.3) - ("rust-crates-io" ,rust-crates-io-0.39) + ("rust-crates-io" ,rust-crates-io-0.40) ("rust-curl" ,rust-curl-0.4) ("rust-curl-sys" ,rust-curl-sys-0.4) ("rust-filetime" ,rust-filetime-0.2) ("rust-flate2" ,rust-flate2-1) - ("rust-flate2" ,rust-flate2-1) ("rust-git2" ,rust-git2-0.18) ("rust-git2-curl" ,rust-git2-curl-0.19) - ("rust-gix" ,rust-gix-0.55) - ("rust-gix-features" ,rust-gix-features-0.35) + ("rust-gix" ,rust-gix-0.57) + ("rust-gix-features" ,rust-gix-features-0.37) ("rust-glob" ,rust-glob-0.3) ("rust-hex" ,rust-hex-0.4) ("rust-hmac" ,rust-hmac-0.12) @@ -2449,7 +2589,7 @@ background agent taking care of maintaining the necessary state.") ("rust-ignore" ,rust-ignore-0.4) ("rust-im-rc" ,rust-im-rc-15) ("rust-indexmap" ,rust-indexmap-2) - ("rust-itertools" ,rust-itertools-0.11) + ("rust-itertools" ,rust-itertools-0.12) ("rust-jobserver" ,rust-jobserver-0.1) ("rust-lazycell" ,rust-lazycell-1) ("rust-libc" ,rust-libc-0.2) @@ -2460,33 +2600,30 @@ background agent taking care of maintaining the necessary state.") ("rust-os-info" ,rust-os-info-3) ("rust-pasetors" ,rust-pasetors-0.6) ("rust-pathdiff" ,rust-pathdiff-0.2) - ("rust-pulldown-cmark" ,rust-pulldown-cmark-0.9) ("rust-rand" ,rust-rand-0.8) - ("rust-rustfix" ,rust-rustfix-0.6) + ("rust-regex" ,rust-regex-1) + ("rust-rusqlite" ,rust-rusqlite-0.30) + ("rust-rustfix" ,rust-rustfix-0.8) ("rust-semver" ,rust-semver-1) ("rust-serde" ,rust-serde-1) ("rust-serde-untagged" ,rust-serde-untagged-0.1) - ("rust-serde-value" ,rust-serde-value-0.7) ("rust-serde-ignored" ,rust-serde-ignored-0.1) ("rust-serde-json" ,rust-serde-json-1) ("rust-sha1" ,rust-sha1-0.10) ("rust-shell-escape" ,rust-shell-escape-0.1) ("rust-supports-hyperlinks" ,rust-supports-hyperlinks-2) - ("rust-syn" ,rust-syn-2) - ("rust-tar" ,rust-tar-0.4) ("rust-tar" ,rust-tar-0.4) ("rust-tempfile" ,rust-tempfile-3) ("rust-time" ,rust-time-0.3) ("rust-toml" ,rust-toml-0.8) - ("rust-toml-edit" ,rust-toml-edit-0.20) + ("rust-toml-edit" ,rust-toml-edit-0.21) ("rust-tracing" ,rust-tracing-0.1) ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3) ("rust-unicase" ,rust-unicase-2) ("rust-unicode-width" ,rust-unicode-width-0.1) - ("rust-unicode-xid" ,rust-unicode-xid-0.2) ("rust-url" ,rust-url-2) ("rust-walkdir" ,rust-walkdir-2) - ("rust-windows-sys" ,rust-windows-sys-0.48)) + ("rust-windows-sys" ,rust-windows-sys-0.52)) #:cargo-development-inputs (("rust-same-file" ,rust-same-file-1) ("rust-snapbox" ,rust-snapbox-0.4)))) (native-inputs @@ -2502,19 +2639,19 @@ the library crate of Cargo.") (define-public rust-cargo-c (package (name "rust-cargo-c") - (version "0.9.29+cargo-0.76.0") + (version "0.9.31+cargo-0.78.0") (source (origin (method url-fetch) (uri (crate-uri "cargo-c" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "03ks9rl2skvf5j93sbmbz6l72k5cgvf4hc0nhnp7aadrvb05v5sr")))) + (base32 "1y60hhjikkzk5s36gskgbxbyzr6ik7w0dn5j84mvqlilcs3ab0lj")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-anyhow" ,rust-anyhow-1) - ("rust-cargo" ,rust-cargo-0.76) + ("rust-cargo" ,rust-cargo) ("rust-cargo-util" ,rust-cargo-util-0.2) ("rust-cbindgen" ,rust-cbindgen-0.26) ("rust-cc" ,rust-cc-1) @@ -2527,7 +2664,7 @@ the library crate of Cargo.") ("rust-serde" ,rust-serde-1) ("rust-serde-derive" ,rust-serde-derive-1) ("rust-serde-json" ,rust-serde-json-1) - ("rust-toml" ,rust-toml-0.7) + ("rust-toml" ,rust-toml-0.8) ("rust-windows-sys" ,rust-windows-sys-0.52)))) (native-inputs (list pkg-config)) @@ -3027,7 +3164,7 @@ advanced keybindings, word-level diff highlighting, syntax highlighting for (define-public rust-xremap (package (name "rust-xremap") - (version "0.8.14") + (version "0.10.0") (source (origin (method url-fetch) @@ -3035,7 +3172,7 @@ advanced keybindings, word-level diff highlighting, syntax highlighting for (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1691clzqbwcywz66k0lf5wjz3q5cpbks0l090bfv42idzr5a0ghl")))) + "13pvlc40zha7c9ma30s32x65c8qciqcnsznw43crx3wymlaqc9sn")))) (build-system cargo-build-system) (arguments `(#:features '() @@ -3048,7 +3185,6 @@ advanced keybindings, word-level diff highlighting, syntax highlighting for ("rust-env-logger" ,rust-env-logger-0.10) ("rust-evdev" ,rust-evdev-0.12) ("rust-fork" ,rust-fork-0.1) - ("rust-hyprland" ,rust-hyprland-0.3) ("rust-indoc" ,rust-indoc-2) ("rust-lazy-static" ,rust-lazy-static-1) ("rust-log" ,rust-log-0.4) @@ -3058,7 +3194,6 @@ advanced keybindings, word-level diff highlighting, syntax highlighting for ("rust-serde-json" ,rust-serde-json-1) ("rust-serde-with" ,rust-serde-with-3) ("rust-serde-yaml" ,rust-serde-yaml-0.9) - ("rust-swayipc" ,rust-swayipc-3) ("rust-toml" ,rust-toml-0.8) ("rust-wayland-client" ,rust-wayland-client-0.30) ("rust-wayland-protocols-wlr" ,rust-wayland-protocols-wlr-0.1) @@ -3073,19 +3208,19 @@ advanced keybindings, word-level diff highlighting, syntax highlighting for (xremap (string-append out "/bin/xremap"))) (mkdir-p (string-append share "/bash-completion/completions")) (with-output-to-file - (string-append share "/bash-completion/completions/xremap") + (string-append share "/bash-completion/completions/xremap") (lambda _ (invoke xremap "--completions" "bash"))) (mkdir-p (string-append share "/fish/vendor_completions.d")) (with-output-to-file - (string-append share "/fish/vendor_completions.d/xremap.fish") + (string-append share "/fish/vendor_completions.d/xremap.fish") (lambda _ (invoke xremap "--completions" "fish"))) (mkdir-p (string-append share "/zsh/site-functions")) (with-output-to-file - (string-append share "/zsh/site-functions/_xremap") + (string-append share "/zsh/site-functions/_xremap") (lambda _ (invoke xremap "--completions" "zsh"))) (mkdir-p (string-append share "/elvish/lib")) (with-output-to-file - (string-append share "/elvish/lib/xremap") + (string-append share "/elvish/lib/xremap") (lambda _ (invoke xremap "--completions" "elvish"))))))))) (home-page "https://github.com/k0kubun/xremap") (synopsis "Dynamic key remapp for X and Wayland") @@ -3100,14 +3235,6 @@ advanced keybindings, word-level diff highlighting, syntax highlighting for (substitute-keyword-arguments (package-arguments rust-xremap) ((#:features _) '(list "gnome")))))) -(define-public xremap-sway - (package - (inherit rust-xremap) - (name "xremap-sway") - (arguments - (substitute-keyword-arguments (package-arguments rust-xremap) - ((#:features _) '(list "sway")))))) - (define-public xremap-wlroots (package (inherit rust-xremap) @@ -3116,6 +3243,12 @@ advanced keybindings, word-level diff highlighting, syntax highlighting for (substitute-keyword-arguments (package-arguments rust-xremap) ((#:features _) '(list "wlroots")))))) +(define-public xremap-hyprland + (deprecated-package "xremap-hyprland" xremap-wlroots)) + +(define-public xremap-sway + (deprecated-package "xremap-sway" xremap-wlroots)) + (define-public xremap-x11 (package (inherit rust-xremap) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index a385344473..465899fe9d 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -73,7 +73,9 @@ #:use-module (ice-9 match) #:use-module (ice-9 optargs) #:use-module (srfi srfi-1) - #:use-module (srfi srfi-26)) + #:use-module (srfi srfi-26) + #:use-module (srfi srfi-34) + #:use-module (srfi srfi-35)) ;; This is the hash for the empty file, and the reason it's relevant is not ;; the most obvious. @@ -958,8 +960,8 @@ safety and thread safety guarantees.") (replace "llvm" llvm-17)))))) (define-public rust-1.77 - (let ((base-rust (rust-bootstrapped-package rust-1.76 "1.77.0" - "11rda8d8qj24a5mkjzj1x6x9pkvaq0zlhkgdp5b39zj5m0gwsv0d"))) + (let ((base-rust (rust-bootstrapped-package rust-1.76 "1.77.1" + "18d4ncdzp0nfimmw029xdf7vv1hgh82v30mjnnixnllzar66w47f"))) (package (inherit base-rust) (arguments @@ -1025,12 +1027,12 @@ safety and thread safety guarantees.") ;;; Here we take the latest included Rust, make it public, and re-enable tests ;;; and extra components such as rustfmt. (define-public rust - (let ((base-rust rust-1.75)) + (let ((base-rust rust-1.77)) (package (inherit base-rust) (properties (append (alist-delete 'hidden? (package-properties base-rust)) - (clang-compiler-cpu-architectures "15"))) + (clang-compiler-cpu-architectures "17"))) (outputs (cons* "rust-src" "tools" (package-outputs base-rust))) (source (origin @@ -1039,6 +1041,7 @@ safety and thread safety guarantees.") '(begin (for-each delete-file-recursively '("src/llvm-project" + "vendor/jemalloc-sys/jemalloc" "vendor/openssl-src/openssl" "vendor/tikv-jemalloc-sys/jemalloc" ;; These are referenced by the cargo output @@ -1047,7 +1050,8 @@ safety and thread safety guarantees.") "vendor/curl-sys-0.4.63+curl-8.1.2/curl" "vendor/libffi-sys/libffi" "vendor/libnghttp2-sys/nghttp2" - "vendor/libz-sys/src/zlib")) + "vendor/libz-sys/src/zlib" + "vendor/libz-sys-1.1.9/src/zlib")) ;; Use the packaged nghttp2 (delete-file "vendor/libnghttp2-sys/build.rs") (with-output-to-file "vendor/libnghttp2-sys/build.rs" @@ -1138,7 +1142,12 @@ safety and thread safety guarantees.") '("fn uplift_dwp_of_bin_on_linux"))) (substitute* "cache_lock.rs" ,@(make-ignore-test-list - '("fn multiple_download"))))))) + '("fn multiple_shared" + "fn multiple_download" + "fn download_then_mutate"))) + (substitute* "global_cache_tracker.rs" + ,@(make-ignore-test-list + '("fn package_cache_lock_during_build"))))))) `()) (add-after 'unpack 'disable-tests-broken-on-aarch64 (lambda _ @@ -1191,7 +1200,7 @@ safety and thread safety guarantees.") ;; The three tests which are known to fail upstream on QEMU ;; emulation on aarch64 and riscv64 also fail on x86_64 in ;; Guix's build system. Skip them on all builds. - (substitute* "sys/unix/process/process_common/tests.rs" + (substitute* "sys/pal/unix/process/process_common/tests.rs" ;; We can't use make-ignore-test-list because we will get ;; build errors due to the double [ignore] block. (("target_arch = \"arm\"" arm) @@ -1309,6 +1318,13 @@ exec -a \"$0\" \"~a\" \"$@\"" (define make-rust-sysroot/implementation (mlambda (target base-rust) + (unless (platform-rust-target (lookup-platform-by-target target)) + (raise + (condition + (&package-unsupported-target-error + (package base-rust) + (target target))))) + (package (inherit base-rust) (name (string-append "rust-sysroot-for-" target)) diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index d3a0e33b19..c24089c0e3 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -571,8 +571,8 @@ directory.") (properties '((upstream-name . "SDL2_ttf"))))) (define-public sdl2-gamecontrollerdb - (let ((commit "6f3c4edcb5a2e2ed090ca8af40d2c0f00dcd77f6") - (revision "0")) + (let ((commit "9d0994523206c9d73925d78d185531c4c7331db7") + (revision "1")) (package (name "sdl2-gamecontrollerdb") (version (git-version "0" revision commit)) @@ -584,7 +584,7 @@ directory.") (commit commit))) (file-name (git-file-name name version)) (sha256 - (base32 "1gciqc8qm2qgcjj5s9jpclznznsp6awl4ldrnj7g01chkcx0l6a3")))) + (base32 "08rv3i6sh90ibphxnv9r6h1zjyq88x9hq3smvf6cnlqvirnam94s")))) (build-system copy-build-system) (arguments '(#:install-plan '(("gamecontrollerdb.txt" "share/sdl2/")))) diff --git a/gnu/packages/sequoia.scm b/gnu/packages/sequoia.scm index 067197ffc5..8cec446daa 100644 --- a/gnu/packages/sequoia.scm +++ b/gnu/packages/sequoia.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019, 2020, 2021 Hartmut Goebel <h.goebel@crazy-compilers.com> -;;; Copyright © 2021, 2023 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2021, 2023, 2024 Efraim Flashner <efraim@flashner.co.il> ;;; ;;; This file is part of GNU Guix. ;;; @@ -36,25 +36,57 @@ #:use-module (gnu packages multiprecision) #:use-module (gnu packages nettle) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages serialization) #:use-module (gnu packages sqlite) #:use-module (gnu packages tls)) +(define-public rust-openpgp-cert-d-0.3 + (package + (name "rust-openpgp-cert-d") + (version "0.3.1") + (source + (origin + (method url-fetch) + (uri (crate-uri "openpgp-cert-d" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1kk2mr4rsib04cygv7jg55wvdxivakggqsfrn4apnaxxl5aknb0c")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; Not all files included. + #:cargo-inputs + (("rust-anyhow" ,rust-anyhow-1) + ("rust-dirs" ,rust-dirs-5) + ("rust-fd-lock" ,rust-fd-lock-3) + ("rust-libc" ,rust-libc-0.2) + ("rust-sha1collisiondetection" ,rust-sha1collisiondetection-0.3) + ("rust-tempfile" ,rust-tempfile-3) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-walkdir" ,rust-walkdir-2)) + #:cargo-development-inputs (("rust-assert-fs" ,rust-assert-fs-1) + ("rust-predicates" ,rust-predicates-3)))) + (home-page "https://gitlab.com/sequoia-pgp/pgp-cert-d") + (synopsis "Shared OpenPGP Certificate Directory") + (description "This package provides the shared code for a @code{OpenPGP} +Certificate Directory.") + (license license:expat))) + (define-public rust-sequoia-autocrypt-0.25 (package (name "rust-sequoia-autocrypt") - (version "0.25.0") + (version "0.25.1") (source (origin (method url-fetch) (uri (crate-uri "sequoia-autocrypt" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0796mn8kwrpfc8qzliwyyy62mrg2w0j6ax8929jwrkibvwy2axi2")))) + "0ns121ggmx690m8czhc7zbb7rwz0jjv3l5gw4igs6mn1hznc0kz2")))) (build-system cargo-build-system) (arguments `(#:features '("sequoia-openpgp/crypto-nettle") #:cargo-inputs - (("rust-base64" ,rust-base64-0.13) + (("rust-base64" ,rust-base64-0.21) ("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1)) #:cargo-development-inputs (("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1)))) @@ -69,37 +101,34 @@ and decoding of Autocrypt headers and setup messages. Note: Autocrypt is more than just headers; it requires tight integration with the MUA.") (license license:lgpl2.0+))) -(define-public rust-sequoia-cert-store-0.3 +(define-public rust-sequoia-cert-store-0.5 (package (name "rust-sequoia-cert-store") - (version "0.3.2") - (source (origin - (method url-fetch) - (uri (crate-uri "sequoia-cert-store" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "0gmkqn2f23i2xwjwmnaj3dx9l4ir74dyylkw1qsxawxd95i8dk02")))) + (version "0.5.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "sequoia-cert-store" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1rjakcnhwdvwrm0952rpi9ky8cxvv5bnmylval49s3a087jqcm76")))) (build-system cargo-build-system) (arguments `(#:features '("sequoia-openpgp/crypto-nettle") - #:cargo-inputs - (("rust-anyhow" ,rust-anyhow-1) - ("rust-crossbeam" ,rust-crossbeam-0.8) - ("rust-dirs" ,rust-dirs-5) - ("rust-num-cpus" ,rust-num-cpus-1) - ("rust-once-cell" ,rust-once-cell-1) - ("rust-openpgp-cert-d" ,rust-openpgp-cert-d-0.1) - ("rust-rayon" ,rust-rayon-1) - ("rust-rusqlite" ,rust-rusqlite-0.29) - ("rust-sequoia-net" ,rust-sequoia-net-0.27) - ("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1) - ("rust-smallvec" ,rust-smallvec-1) - ("rust-thiserror" ,rust-thiserror-1) - ("rust-tokio" ,rust-tokio-1)) - #:cargo-development-inputs - (("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1) - ("rust-tempfile" ,rust-tempfile-3)))) + #:cargo-inputs (("rust-anyhow" ,rust-anyhow-1) + ("rust-crossbeam" ,rust-crossbeam-0.8) + ("rust-dirs" ,rust-dirs-5) + ("rust-num-cpus" ,rust-num-cpus-1) + ("rust-openpgp-cert-d" ,rust-openpgp-cert-d-0.3) + ("rust-rayon" ,rust-rayon-1) + ("rust-rusqlite" ,rust-rusqlite-0.29) + ("rust-sequoia-net" ,rust-sequoia-net-0.28) + ("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1) + ("rust-smallvec" ,rust-smallvec-1) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-tokio" ,rust-tokio-1)) + #:cargo-development-inputs (("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1) + ("rust-tempfile" ,rust-tempfile-3)))) (native-inputs (list clang pkg-config)) (inputs @@ -109,92 +138,197 @@ than just headers; it requires tight integration with the MUA.") (description "This package provides a certificate database interface.") (license license:lgpl2.0+))) -(define-public rust-sequoia-ipc-0.30 +(define-public rust-sequoia-ipc-0.33 (package (name "rust-sequoia-ipc") - (version "0.30.1") + (version "0.33.0") (source - (origin - (method url-fetch) - (uri (crate-uri "sequoia-ipc" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 "1fgqjwaw9rz74y394i3n2a6y2vvy0214daamzswn5ahidhycm3x3")))) + (origin + (method url-fetch) + (uri (crate-uri "sequoia-ipc" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0h4b675m6r9r64ibv472fsyqkfh9xbx2wz4jaa4v01ivgsd7k3r1")))) (build-system cargo-build-system) (arguments `(#:features '("sequoia-openpgp/crypto-nettle") - #:cargo-inputs - (("rust-anyhow" ,rust-anyhow-1) - ("rust-buffered-reader" ,rust-buffered-reader-1) - ("rust-capnp-rpc" ,rust-capnp-rpc-0.14) - ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.8) - ("rust-ctor" ,rust-ctor-0.1) - ("rust-dirs" ,rust-dirs-4) - ("rust-fs2" ,rust-fs2-0.4) - ("rust-futures" ,rust-futures-0.3) - ("rust-lalrpop" ,rust-lalrpop-0.19) - ("rust-lalrpop-util" ,rust-lalrpop-util-0.19) - ("rust-lazy-static" ,rust-lazy-static-1) - ("rust-libc" ,rust-libc-0.2) - ("rust-memsec" ,rust-memsec-0.6) - ("rust-rand" ,rust-rand-0.8) - ("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1) - ("rust-socket2" ,rust-socket2-0.4) - ("rust-tempfile" ,rust-tempfile-3) - ("rust-thiserror" ,rust-thiserror-1) - ("rust-tokio" ,rust-tokio-1) - ("rust-tokio-util" ,rust-tokio-util-0.7) - ("rust-winapi" ,rust-winapi-0.3)) - #:cargo-development-inputs - (("rust-clap" ,rust-clap-3) - ("rust-quickcheck" ,rust-quickcheck-1) - ("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1) - ("rust-tokio" ,rust-tokio-1)))) + #:cargo-inputs (("rust-anyhow" ,rust-anyhow-1) + ("rust-buffered-reader" ,rust-buffered-reader-1) + ("rust-capnp-rpc" ,rust-capnp-rpc-0.19) + ("rust-crossbeam-utils" ,rust-crossbeam-utils-0.8) + ("rust-ctor" ,rust-ctor-0.2) + ("rust-dirs" ,rust-dirs-5) + ("rust-fs2" ,rust-fs2-0.4) + ("rust-futures" ,rust-futures-0.3) + ("rust-lalrpop" ,rust-lalrpop-0.17) + ("rust-lalrpop-util" ,rust-lalrpop-util-0.17) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-memsec" ,rust-memsec-0.5) + ("rust-rand" ,rust-rand-0.8) + ("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1) + ("rust-socket2" ,rust-socket2-0.5) + ("rust-tempfile" ,rust-tempfile-3) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-tokio" ,rust-tokio-1) + ("rust-tokio-util" ,rust-tokio-util-0.7) + ("rust-winapi" ,rust-winapi-0.3)) + #:cargo-development-inputs (("rust-clap" ,rust-clap-4) + ("rust-quickcheck" ,rust-quickcheck-1) + ("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1) + ("rust-tokio" ,rust-tokio-1)))) (native-inputs (list clang pkg-config)) (inputs (list nettle)) (home-page "https://sequoia-pgp.org/") (synopsis "Interprocess communication infrastructure for Sequoia") - (description "Interprocess communication infrastructure for Sequoia") + (description + "This package provides interprocess communication infrastructure for Sequoia.") (license license:lgpl2.0+))) -(define-public rust-sequoia-net-0.27 +(define-public rust-sequoia-keystore-0.2 (package - (name "rust-sequoia-net") - (version "0.27.0") - (source (origin - (method url-fetch) - (uri (crate-uri "sequoia-net" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "0gyk5765hi3s05l64a744f9a4vynfisja92l51az9dpqgfkiw3wn")))) + (name "rust-sequoia-keystore") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "sequoia-keystore" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "11rb2k5v2mc5nf2bafp78nydgcx4gizyxqa9b9lc3d1b73mqv2ad")))) (build-system cargo-build-system) (arguments `(#:features '("sequoia-openpgp/crypto-nettle") #:cargo-inputs (("rust-anyhow" ,rust-anyhow-1) - ("rust-base64" ,rust-base64-0.13) - ("rust-futures-util" ,rust-futures-util-0.3) - ("rust-http" ,rust-http-0.2) - ("rust-hyper" ,rust-hyper-0.14) - ("rust-hyper-tls" ,rust-hyper-tls-0.5) - ("rust-libc" ,rust-libc-0.2) - ("rust-native-tls" ,rust-native-tls-0.2) - ("rust-percent-encoding" ,rust-percent-encoding-2) + ("rust-capnp" ,rust-capnp-0.19) + ("rust-capnpc" ,rust-capnpc-0.19) + ("rust-dirs" ,rust-dirs-5) + ("rust-env-logger" ,rust-env-logger-0.10) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-log" ,rust-log-0.4) + ("rust-paste" ,rust-paste-1) + ("rust-sequoia-ipc" ,rust-sequoia-ipc-0.33) + ("rust-sequoia-keystore-backend" ,rust-sequoia-keystore-backend-0.2) + ("rust-sequoia-keystore-softkeys" ,rust-sequoia-keystore-softkeys-0.2) ("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1) - ("rust-tempfile" ,rust-tempfile-3) ("rust-thiserror" ,rust-thiserror-1) ("rust-tokio" ,rust-tokio-1) - ("rust-trust-dns-client" ,rust-trust-dns-client-0.22) - ("rust-trust-dns-resolver" ,rust-trust-dns-resolver-0.22) - ("rust-url" ,rust-url-2) - ("rust-zbase32" ,rust-zbase32-0.1)) + ("rust-tokio-util" ,rust-tokio-util-0.7)) #:cargo-development-inputs - (("rust-hyper" ,rust-hyper-0.14) - ("rust-rand" ,rust-rand-0.8) - ("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1)))) + (("rust-dircpy" ,rust-dircpy-0.3) + ("rust-env-logger" ,rust-env-logger-0.10) + ("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1) + ("rust-test-log" ,rust-test-log-0.2) + ("rust-tracing" ,rust-tracing-0.1) + ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3)))) + (native-inputs (list capnproto clang pkg-config)) + (inputs (list nettle)) + (home-page "https://sequoia-pgp.org/") + (synopsis "Sequoia's private key store server") + (description "This package contains sequoia's private key store server.") + (license license:lgpl2.0+))) + +(define-public rust-sequoia-keystore-backend-0.2 + (package + (name "rust-sequoia-keystore-backend") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "sequoia-keystore-backend" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "07v6rc27v0di2v59mixshhc4fkkf1ig0yqkzgqz0v2si4z8slv3s")))) + (build-system cargo-build-system) + (arguments + `(#:features '("sequoia-openpgp/crypto-nettle") + #:cargo-inputs (("rust-anyhow" ,rust-anyhow-1) + ("rust-blanket" ,rust-blanket-0.3) + ("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1) + ("rust-thiserror" ,rust-thiserror-1)) + #:cargo-development-inputs + (("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1)))) + (native-inputs (list clang pkg-config)) + (inputs (list nettle)) + (home-page "https://sequoia-pgp.org/") + (synopsis "Traits for private key store backends") + (description "This package contains traits for private key store backends.") + (license license:lgpl2.0+))) + +(define-public rust-sequoia-keystore-softkeys-0.2 + (package + (name "rust-sequoia-keystore-softkeys") + (version "0.2.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "sequoia-keystore-softkeys" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "151f1ai0bxvab8fi314qcybilv4vq26gfdcs3yp7r28xqn9hldw0")))) + (build-system cargo-build-system) + (arguments + `(#:features '("sequoia-openpgp/crypto-nettle") + #:cargo-inputs + (("rust-anyhow" ,rust-anyhow-1) + ("rust-dirs" ,rust-dirs-5) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-log" ,rust-log-0.4) + ("rust-sequoia-keystore-backend" ,rust-sequoia-keystore-backend-0.2) + ("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1)) + #:cargo-development-inputs + (("rust-env-logger" ,rust-env-logger-0.10) + ("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1) + ("rust-test-log" ,rust-test-log-0.2) + ("rust-tracing" ,rust-tracing-0.1) + ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3)))) + (native-inputs (list clang pkg-config)) + (inputs (list nettle)) + (home-page "https://sequoia-pgp.org/") + (synopsis "In-memory backend for Sequoia's private key store") + (description + "This package provides a soft key (in-memory key) backend for Sequoia's +private key store.") + (license license:lgpl2.0+))) + +(define-public rust-sequoia-net-0.28 + (package + (name "rust-sequoia-net") + (version "0.28.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "sequoia-net" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0jw1p8gwf505q6dh1281fl7kmh8mr1f4hswl5crrycwqlq5q3gva")))) + (build-system cargo-build-system) + (arguments + `(#:features '("sequoia-openpgp/crypto-nettle") + #:cargo-inputs (("rust-anyhow" ,rust-anyhow-1) + ("rust-base64" ,rust-base64-0.21) + ("rust-futures-util" ,rust-futures-util-0.3) + ("rust-hickory-client" ,rust-hickory-client-0.24) + ("rust-hickory-resolver" ,rust-hickory-resolver-0.24) + ("rust-http" ,rust-http-0.2) + ("rust-hyper" ,rust-hyper-0.14) + ("rust-hyper-tls" ,rust-hyper-tls-0.5) + ("rust-libc" ,rust-libc-0.2) + ("rust-percent-encoding" ,rust-percent-encoding-2) + ("rust-reqwest" ,rust-reqwest-0.11) + ("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1) + ("rust-tempfile" ,rust-tempfile-3) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-tokio" ,rust-tokio-1) + ("rust-url" ,rust-url-2) + ("rust-z-base-32" ,rust-z-base-32-0.1)) + #:cargo-development-inputs (("rust-hyper" ,rust-hyper-0.14) + ("rust-rand" ,rust-rand-0.8) + ("rust-reqwest" ,rust-reqwest-0.11) + ("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1)))) (native-inputs (list clang pkg-config)) (inputs @@ -208,27 +342,23 @@ HKP protocol, and searching and publishing Web Key Directories.") (define-public rust-sequoia-openpgp-1 (package (name "rust-sequoia-openpgp") - (version "1.16.0") + (version "1.19.0") (source (origin (method url-fetch) (uri (crate-uri "sequoia-openpgp" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1z0xl7hnm1p51pyhwdqyzcnl2dhzfjnvssz7hi15ps1hk4zzzvrh")))) + (base32 "1x3d4yj8mhra8yhcxz6z73pb77pzk0zl1vgxx0yrimzk9b759wgb")))) (build-system cargo-build-system) - (native-inputs - (list clang pkg-config)) - (inputs - (list gmp nettle)) (arguments `(#:features '("crypto-nettle") #:cargo-test-flags (list "--release" "--" - ;; TODO: Figure out how this test is supposed to fail. - "--skip=parse::test::panic_on_short_zip") + "--skip=leak_tests::test_ed25519") #:cargo-inputs (("rust-aes" ,rust-aes-0.8) + ("rust-aes-gcm" ,rust-aes-gcm-0.10) ("rust-anyhow" ,rust-anyhow-1) ("rust-base64" ,rust-base64-0.21) ("rust-block-padding" ,rust-block-padding-0.3) @@ -236,25 +366,26 @@ HKP protocol, and searching and publishing Web Key Directories.") ("rust-botan" ,rust-botan-0.10) ("rust-buffered-reader" ,rust-buffered-reader-1) ("rust-bzip2" ,rust-bzip2-0.4) + ("rust-camellia" ,rust-camellia-0.1) ("rust-cast5" ,rust-cast5-0.11) ("rust-cfb-mode" ,rust-cfb-mode-0.8) ("rust-chrono" ,rust-chrono-0.4) ("rust-cipher" ,rust-cipher-0.4) ("rust-des" ,rust-des-0.8) ("rust-digest" ,rust-digest-0.10) + ("rust-dsa" ,rust-dsa-0.6) ("rust-dyn-clone" ,rust-dyn-clone-1) ("rust-eax" ,rust-eax-0.5) ("rust-ecb" ,rust-ecb-0.1) ("rust-ecdsa" ,rust-ecdsa-0.16) - ("rust-ed25519" ,rust-ed25519-1) - ("rust-ed25519-dalek" ,rust-ed25519-dalek-1) + ("rust-ed25519" ,rust-ed25519-2) + ("rust-ed25519-dalek" ,rust-ed25519-dalek-2) ("rust-flate2" ,rust-flate2-1) - ("rust-generic-array" ,rust-generic-array-0.14) ("rust-getrandom" ,rust-getrandom-0.2) ("rust-idea" ,rust-idea-0.5) - ("rust-idna" ,rust-idna-0.3) - ("rust-lalrpop" ,rust-lalrpop-0.19) - ("rust-lalrpop-util" ,rust-lalrpop-util-0.19) + ("rust-idna" ,rust-idna-0.5) + ("rust-lalrpop" ,rust-lalrpop-0.20) + ("rust-lalrpop-util" ,rust-lalrpop-util-0.20) ("rust-lazy-static" ,rust-lazy-static-1) ("rust-libc" ,rust-libc-0.2) ("rust-md-5" ,rust-md-5-0.10) @@ -265,29 +396,30 @@ HKP protocol, and searching and publishing Web Key Directories.") ("rust-openssl" ,rust-openssl-0.10) ("rust-openssl-sys" ,rust-openssl-sys-0.9) ("rust-p256" ,rust-p256-0.13) - ("rust-rand" ,rust-rand-0.7) - ("rust-rand" ,rust-rand-0.7) ("rust-rand" ,rust-rand-0.8) ("rust-rand-core" ,rust-rand-core-0.6) ("rust-regex" ,rust-regex-1) - ("rust-regex-syntax" ,rust-regex-syntax-0.6) + ("rust-regex-syntax" ,rust-regex-syntax-0.8) ("rust-ripemd" ,rust-ripemd-0.1) ("rust-rsa" ,rust-rsa-0.9) - ("rust-sha-1" ,rust-sha-1-0.10) - ("rust-sha1collisiondetection" ,rust-sha1collisiondetection-0.2) + ("rust-sha1collisiondetection" ,rust-sha1collisiondetection-0.3) ("rust-sha2" ,rust-sha2-0.10) ("rust-thiserror" ,rust-thiserror-1) ("rust-twofish" ,rust-twofish-0.7) ("rust-typenum" ,rust-typenum-1) ("rust-win-crypto-ng" ,rust-win-crypto-ng-0.5) ("rust-winapi" ,rust-winapi-0.3) - ("rust-x25519-dalek-ng" ,rust-x25519-dalek-ng-1) + ("rust-x25519-dalek" ,rust-x25519-dalek-2) ("rust-xxhash-rust" ,rust-xxhash-rust-0.8)) #:cargo-development-inputs - (("rust-criterion" ,rust-criterion-0.4) + (("rust-criterion" ,rust-criterion-0.5) ("rust-quickcheck" ,rust-quickcheck-1) ("rust-rand" ,rust-rand-0.8) - ("rust-rpassword" ,rust-rpassword-6)))) + ("rust-rpassword" ,rust-rpassword-7)))) + (native-inputs + (list clang pkg-config)) + (inputs + (list gmp nettle)) (home-page "https://sequoia-pgp.org/") (synopsis "OpenPGP data types and associated machinery") (description "This crate aims to provide a complete implementation of @@ -397,47 +529,43 @@ Although the above appear simple to parse, RFC 2822's whitespace and comment rules are rather complex. This crate implements the whole grammar." ) (license license:gpl3))) -(define-public rust-sequoia-wot-0.8 +(define-public rust-sequoia-wot-0.11 (package (name "rust-sequoia-wot") - (version "0.8.1") - (source (origin - (method url-fetch) - (uri (crate-uri "sequoia-wot" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "0rcp7ndjpdd4dkryhkkhakc8axbj93c1gr9qxxksdvrik803alfg")))) + (version "0.11.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "sequoia-wot" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0hb17adcqz357ci3d4v57pmywy4giq8591p1vb7p83h56zdk0sfi")))) (build-system cargo-build-system) (arguments `(#:features '("sequoia-openpgp/crypto-nettle") - #:cargo-test-flags - (list "--release" "--" - ;; Not all files included. - "--skip=gpg_trust_roots") - #:cargo-inputs - (("rust-anyhow" ,rust-anyhow-1) - ("rust-chrono" ,rust-chrono-0.4) - ("rust-clap" ,rust-clap-4) - ("rust-clap-complete" ,rust-clap-complete-4) - ("rust-clap-mangen" ,rust-clap-mangen-0.2) - ("rust-crossbeam" ,rust-crossbeam-0.8) - ("rust-dot-writer" ,rust-dot-writer-0.1) - ("rust-enumber" ,rust-enumber-0.3) - ("rust-lazy-static" ,rust-lazy-static-1) - ("rust-num-cpus" ,rust-num-cpus-1) - ("rust-openpgp-cert-d" ,rust-openpgp-cert-d-0.1) - ("rust-sequoia-cert-store" ,rust-sequoia-cert-store-0.3) - ("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1) - ("rust-sequoia-policy-config" ,rust-sequoia-policy-config-0.6) - ("rust-thiserror" ,rust-thiserror-1) - ("rust-tokio" ,rust-tokio-1)) - #:cargo-development-inputs - (("rust-assert-cmd" ,rust-assert-cmd-2) - ("rust-predicates" ,rust-predicates-2) - ("rust-quickcheck" ,rust-quickcheck-1) - ("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1) - ("rust-tempfile" ,rust-tempfile-3)))) + #:cargo-test-flags '("--release" "--" + ;; Not all files included. + "--skip=gpg_trust_roots") + #:cargo-inputs (("rust-anyhow" ,rust-anyhow-1) + ("rust-anyhow" ,rust-anyhow-1) + ("rust-chrono" ,rust-chrono-0.4) + ("rust-clap" ,rust-clap-4) + ("rust-clap" ,rust-clap-4) + ("rust-clap-complete" ,rust-clap-complete-4) + ("rust-clap-mangen" ,rust-clap-mangen-0.2) + ("rust-crossbeam" ,rust-crossbeam-0.8) + ("rust-dot-writer" ,rust-dot-writer-0.1) + ("rust-enumber" ,rust-enumber-0.3) + ("rust-num-cpus" ,rust-num-cpus-1) + ("rust-sequoia-cert-store" ,rust-sequoia-cert-store-0.5) + ("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1) + ("rust-sequoia-policy-config" ,rust-sequoia-policy-config-0.6) + ("rust-thiserror" ,rust-thiserror-1)) + #:cargo-development-inputs (("rust-assert-cmd" ,rust-assert-cmd-2) + ("rust-predicates" ,rust-predicates-2) + ("rust-quickcheck" ,rust-quickcheck-1) + ("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1) + ("rust-tempfile" ,rust-tempfile-3)))) (inputs (list nettle openssl sqlite)) (native-inputs @@ -450,22 +578,21 @@ rules are rather complex. This crate implements the whole grammar." ) (define-public sequoia-sq (package (name "sequoia-sq") - (version "0.30.0") + (version "0.34.0") (source - (origin - (method url-fetch) - (uri (crate-uri "sequoia-sq" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 "0l3mlhvh93b8s1853gyzzfh1dznjdhbsbyxxcm3bbyxmkyr74wkd")))) + (origin + (method url-fetch) + (uri (crate-uri "sequoia-sq" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "0394xr4wxf5ymc8difnih5s9dpw7rpz9b0n7nnp6782gw65ch6lx")))) (build-system cargo-build-system) - (inputs - (list nettle openssl sqlite)) - (native-inputs - (list clang pkg-config)) (arguments - `(#:tests? #f ; `(dyn std::fmt::Display + 'static)` cannot be sent between threads safely - #:install-source? #f + `(#:install-source? #f + #:cargo-test-flags + (list "--release" "--" + ;; The certificate has an expiration date. + "--skip=sq_autocrypt_import") #:cargo-inputs (("rust-anyhow" ,rust-anyhow-1) ("rust-buffered-reader" ,rust-buffered-reader-1) @@ -473,27 +600,73 @@ rules are rather complex. This crate implements the whole grammar." ) ("rust-chrono" ,rust-chrono-0.4) ("rust-clap" ,rust-clap-4) ("rust-clap-complete" ,rust-clap-complete-4) - ("rust-clap-mangen" ,rust-clap-mangen-0.2) ("rust-dirs" ,rust-dirs-5) ("rust-dot-writer" ,rust-dot-writer-0.1) + ("rust-humantime" ,rust-humantime-2) + ("rust-indicatif" ,rust-indicatif-0.17) ("rust-itertools" ,rust-itertools-0.10) - ("rust-rpassword" ,rust-rpassword-6) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-roff" ,rust-roff-0.2) + ("rust-rpassword" ,rust-rpassword-7) ("rust-sequoia-autocrypt" ,rust-sequoia-autocrypt-0.25) - ("rust-sequoia-cert-store" ,rust-sequoia-cert-store-0.3) - ("rust-sequoia-net" ,rust-sequoia-net-0.27) + ("rust-sequoia-cert-store" ,rust-sequoia-cert-store-0.5) + ("rust-sequoia-keystore" ,rust-sequoia-keystore-0.2) + ("rust-sequoia-net" ,rust-sequoia-net-0.28) ("rust-sequoia-openpgp" ,rust-sequoia-openpgp-1) - ("rust-sequoia-wot" ,rust-sequoia-wot-0.8) + ("rust-sequoia-policy-config" ,rust-sequoia-policy-config-0.6) + ("rust-sequoia-wot" ,rust-sequoia-wot-0.11) ("rust-serde" ,rust-serde-1) ("rust-serde-json" ,rust-serde-json-1) ("rust-subplot-build" ,rust-subplot-build-0.7) ("rust-tempfile" ,rust-tempfile-3) - ("rust-term-size" ,rust-term-size-0.3) + ("rust-termcolor" ,rust-termcolor-1) + ("rust-terminal-size" ,rust-terminal-size-0.2) + ("rust-textwrap" ,rust-textwrap-0.15) ("rust-tokio" ,rust-tokio-1)) #:cargo-development-inputs (("rust-assert-cmd" ,rust-assert-cmd-2) + ("rust-dircpy" ,rust-dircpy-0.3) ("rust-fehler" ,rust-fehler-1) + ("rust-libc" ,rust-libc-0.2) ("rust-predicates" ,rust-predicates-2) - ("rust-subplotlib" ,rust-subplotlib-0.7)))) + ("rust-regex" ,rust-regex-1) + ("rust-subplotlib" ,rust-subplotlib-0.7)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'set-asset-out-dir + (lambda _ + (setenv "ASSET_OUT_DIR" "target/assets"))) + (add-after 'install 'install-more + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (share (string-append out "/share")) + (bash-completions-dir + (string-append out "/etc/bash_completion.d")) + (zsh-completions-dir + (string-append share "/zsh/site-functions")) + (fish-completions-dir + (string-append share "/fish/vendor_completions.d")) + (elvish-completions-dir + (string-append share "/elvish/lib")) + (man1 (string-append share "/man/man1"))) + ;; The completions are generated in build.rs. + (mkdir-p bash-completions-dir) + (mkdir-p elvish-completions-dir) + (for-each (lambda (file) + (install-file file man1)) + (find-files "target/assets/man-pages" "\\.1$")) + (copy-file "target/assets/shell-completions/sq.bash" + (string-append bash-completions-dir "/sq")) + (install-file "target/assets/shell-completions/_sq" + zsh-completions-dir) + (install-file "target/assets/shell-completions/sq.fish" + fish-completions-dir) + (copy-file "target/assets/shell-completions/sq.elv" + (string-append elvish-completions-dir "/sq")))))))) + (inputs + (list nettle openssl sqlite)) + (native-inputs + (list capnproto clang pkg-config)) (home-page "https://sequoia-pgp.org/") (synopsis "Command-line frontend for Sequoia OpenPGP") (description "This package provides the command-line frontend for Sequoia @@ -538,10 +711,10 @@ This Guix package is built to use the nettle cryptographic library.") (define-public sequoia-wot (package - (inherit rust-sequoia-wot-0.8) + (inherit rust-sequoia-wot-0.11) (name "sequoia-wot") (arguments - (substitute-keyword-arguments (package-arguments rust-sequoia-wot-0.8) + (substitute-keyword-arguments (package-arguments rust-sequoia-wot-0.11) ((#:install-source? _ #t) #f) ((#:phases phases '%standard-phases) `(modify-phases ,phases @@ -553,14 +726,16 @@ This Guix package is built to use the nettle cryptographic library.") (for-each (lambda (file) (install-file file man1)) (find-files "target/release" "\\.1$")) - ;; TODO: Install _sq-wot.ps1, sq-wot.elv (mkdir-p (string-append out "/etc/bash_completion.d")) (mkdir-p (string-append share "/fish/vendor_completions.d")) + (mkdir-p (string-append share "/elvish/lib")) (copy-file (car (find-files "target/release" "sq-wot.bash")) (string-append out "/etc/bash_completion.d/sq-wot")) (copy-file (car (find-files "target/release" "sq-wot.fish")) (string-append share "/fish/vendor_completions.d/sq-wot.fish")) + (copy-file (car (find-files "target/release" "sq-wot.elv")) + (string-append share "/elvish/lib/sq-wot")) (install-file (car (find-files "target/release" "_sq-wot")) (string-append share "/zsh/site-functions"))))))))) @@ -573,7 +748,7 @@ This Guix package is built to use the nettle cryptographic library."))) (define-public sequoia (package (name "sequoia") - (version "1.16.0") + (version "1.19.0") (source #f) (build-system trivial-build-system) (arguments diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm index 6e66aec3f5..6aaf416467 100644 --- a/gnu/packages/serialization.scm +++ b/gnu/packages/serialization.scm @@ -856,8 +856,8 @@ style and key ordering are kept, so you can diff the source.") (sha256 (base32 "1dmv163cnslyqccrybkxn0c9s1jk1mmafmgxv75iamnz5lk5l8hk")))) - (build-system python-build-system) - (home-page "https://bitbucket.org/bodhisnarkva/cbor") + (build-system pyproject-build-system) + (home-page "https://github.com/brianolson/cbor_py") (synopsis "Implementation of the Concise Binary Object Representation") (description "Python-cbor provides an implementation of the Concise Binary Object diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index ae4e73956e..c416aaff5c 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -15,7 +15,7 @@ ;;; Copyright © 2019, 2020, 2023 Janneke Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re> ;;; Copyright © 2020 Ryan Prior <rprior@protonmail.com> -;;; Copyright © 2020, 2022 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2020, 2022, 2024 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2020, 2022 Marius Bakke <marius@gnu.org> ;;; Copyright © 2021, 2022 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2021, 2022 Felix Gruber <felgru@posteo.net> @@ -24,6 +24,7 @@ ;;; Copyright © 2023 David Pflug <david@pflug.io> ;;; Copyright © 2023 Jaeme Sifat <jaeme@runbox.com> ;;; Copyright © 2024 Tanguy Le Carrour <tanguy@bioneland.org> +;;; Copyright © 2024 Vinicius Monego <monego@posteo.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -46,10 +47,14 @@ #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages bison) + #:use-module (gnu packages c) + #:use-module (gnu packages check) #:use-module (gnu packages compression) + #:use-module (gnu packages crates-apple) #:use-module (gnu packages crates-crypto) #:use-module (gnu packages crates-graphics) #:use-module (gnu packages crates-io) + #:use-module (gnu packages crates-tls) #:use-module (gnu packages crates-web) #:use-module (gnu packages crates-windows) #:use-module (gnu packages curl) @@ -65,11 +70,14 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages python-build) + #:use-module (gnu packages python-check) + #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages readline) #:use-module (gnu packages rust) #:use-module (gnu packages rust-apps) #:use-module (gnu packages scheme) + #:use-module (gnu packages terminals) #:use-module (gnu packages tls) #:use-module (gnu packages version-control) #:use-module (gnu packages xdisorg) @@ -79,6 +87,7 @@ #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system meson) + #:use-module (guix build-system pyproject) #:use-module (guix build-system python) #:use-module (guix build-system trivial) #:use-module (guix download) @@ -547,18 +556,18 @@ ksh, and tcsh.") (define-public xonsh (package (name "xonsh") - (version "0.15.1") + (version "0.17.0") (source (origin (method url-fetch) (uri (pypi-uri "xonsh" version)) (sha256 (base32 - "0427mimr4k75myg5mnig564kq7xbb5f5hws2ly3gxxl6g8mk79il")) + "17jhhxwm1nbh7yq72y7d4n880x46817iami7lvcj3ywdbzrfg6r9")) (modules '((guix build utils))) (snippet #~(begin - (substitute* "setup.py" + (substitute* "pyproject.toml" (("\"xonsh\\.ply\\.ply\",") "")) ;; Use our properly packaged PLY instead. (substitute* (list "setup.py" @@ -566,28 +575,65 @@ ksh, and tcsh.") "xonsh/lexer.py" "xonsh/parsers/base.py" "xonsh/parsers/completion_context.py" + "xonsh/parsers/v310.py" "xonsh/xonfig.py") (("from xonsh\\.ply\\.(.*) import" _ module) (format #f "from ~a import" module)) - (("from xonsh\\.ply import") "import")) - #t)))) - (build-system python-build-system) + (("from xonsh\\.ply import") "import")))))) + (build-system pyproject-build-system) (arguments - (list ;; TODO Try running run the test suite. - ;; See 'requirements-tests.txt' in the source distribution for more - ;; information. - #:tests? #f + ;; Some tests are failing for reasons like not accessing parent directory + ;; with os.getcwd(), not activating virtual environments, not finding + ;; some commands (man, echo), and not running subprocesses. + (list #:test-flags + #~(list "-k" + (string-append + "not " + (string-join + (list "test_aliases_print" + "test_argv0" + "test_bash_and_is_alias_is_only_functional_alias" + "test_bash_completer" + "test_bash_completer_empty_prefix" + "test_complete_command" + "test_complete_dots" + "test_dirty_working_directory" + "test_equal_sign_arg" + "test_man_completion" + "test_parser_show" + "test_printfile" + "test_printname" + "test_quote_handling" + "test_script" + "test_skipper_command" + "test_sourcefile" + "test_spec_modifier_alias_output_format" + "test_vc_get_branch" + "test_xonsh_activator" + "test_xonsh_lexer") + " and not "))) #:phases #~(modify-phases %standard-phases (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out"))) - (invoke "python" "-m" "compileall" - "--invalidation-mode=unchecked-hash" out) - (invoke "python" "setup.py" "install" "--root=/" - (string-append "--prefix=" out)))))))) + (lambda _ + (invoke "python" "-m" "compileall" + "--invalidation-mode=unchecked-hash" #$output) + (invoke "python" "setup.py" "install" "--root=/" + (string-append "--prefix=" #$output)))) + ;; Some tests run os.mkdir(). + (add-before 'check 'writable-home + (lambda _ + (setenv "HOME" "/tmp")))))) (native-inputs - (list python-setuptools ;needed at build time + (list git-minimal + python-pyte + python-pytest + python-pytest-mock + python-pytest-rerunfailures + python-pytest-subprocess + python-pytest-timeout + python-requests + python-setuptools ;needed at build time python-wheel)) (inputs (list python-distro @@ -967,66 +1013,114 @@ files and text.") (define-public nushell (package (name "nushell") - (version "0.44.0") + (version "0.91.0") (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/nushell/nushell") - (commit version))) - (file-name (git-file-name name version)) + (method url-fetch) + (uri (crate-uri "nu" version)) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "122jlc766v7rpfrz1jwi89sw6jmz7lfnhnr059fhy763fzcvph9c")))) + (base32 "1zrw4jv57iwijd684vf43rw5sc9r0aq38shaizj96jqrgb8g9nja")))) (build-system cargo-build-system) (arguments - `(#:tests? #false ;missing files + `(#:cargo-test-flags + '("--release" "--" + ;; Not all files included + "--skip=tests::test_config_path::test_alternate_config_path" + "--skip=tests::test_config_path::test_default_config_path" + "--skip=tests::test_config_path::test_default_config_path_symlinked_config_files" + "--skip=tests::test_config_path::test_default_symlink_config_path_broken_symlink_config_files" + "--skip=tests::test_config_path::test_default_symlinked_config_path_empty" + ;; Path not available inside build environment + "--skip=path::canonicalize::canonicalize_tilde" + "--skip=path::canonicalize::canonicalize_tilde_relative_to" + ;; could not get mutex lock: PoisonError { .. } + "--skip=plugins::config::closure" + "--skip=plugins::config::none" + "--skip=plugins::config::record" + "--skip=plugins::core_inc::by_one_with_field_passed" + "--skip=plugins::core_inc::by_one_with_no_field_passed" + "--skip=plugins::core_inc::chooses_highest_increment_if_given_more_than_one" + "--skip=plugins::core_inc::explicit_flag" + "--skip=plugins::core_inc::semversion_major_inc" + "--skip=plugins::core_inc::semversion_minor_inc" + "--skip=plugins::core_inc::semversion_patch_inc" + "--skip=plugins::core_inc::semversion_without_passing_field" + "--skip=plugins::custom_values::can_generate_and_updated_multiple_types_of_custom_values" + "--skip=plugins::custom_values::can_get_custom_value_from_plugin_and_instantly_collapse_it" + "--skip=plugins::custom_values::can_get_custom_value_from_plugin_and_pass_it_over" + "--skip=plugins::custom_values::can_get_custom_value_from_plugin_and_pass_it_over_as_an_argument" + "--skip=plugins::custom_values::can_get_describe_plugin_custom_values" + "--skip=plugins::custom_values::fails_if_passing_custom_values_across_plugins" + "--skip=plugins::custom_values::fails_if_passing_engine_custom_values_to_plugins" + "--skip=plugins::formats::eml::from_eml_get_another_header_field" + "--skip=plugins::formats::eml::from_eml_get_replyto_field" + "--skip=plugins::formats::eml::from_eml_get_subject_field" + "--skip=plugins::formats::eml::from_eml_get_to_field" + "--skip=plugins::formats::ics::from_ics_text_to_table" + "--skip=plugins::formats::ics::from_ics_text_with_linebreak_to_table" + "--skip=plugins::formats::ics::infers_types" + "--skip=plugins::formats::ini::parses_ini" + "--skip=plugins::formats::ini::parses_utf16_ini" + "--skip=plugins::formats::ini::read_ini_with_missing_session" + "--skip=plugins::formats::vcf::from_vcf_text_to_table" + "--skip=plugins::formats::vcf::from_vcf_text_with_linebreak_to_table" + "--skip=plugins::formats::vcf::infers_types" + "--skip=plugins::register::help" + "--skip=plugins::register::search_terms" + "--skip=plugins::stream::collect_external_accepts_list_of_binary" + "--skip=plugins::stream::collect_external_accepts_list_of_string" + "--skip=plugins::stream::collect_external_big_stream" + "--skip=plugins::stream::collect_external_produces_raw_input" + "--skip=plugins::stream::seq_big_stream" + "--skip=plugins::stream::seq_describe_no_collect_succeeds_without_error" + "--skip=plugins::stream::seq_produces_stream" + "--skip=plugins::stream::seq_stream_collects_to_correct_list" + "--skip=plugins::stream::sum_accepts_list_of_float" + "--skip=plugins::stream::sum_accepts_list_of_int" + "--skip=plugins::stream::sum_accepts_stream_of_float" + "--skip=plugins::stream::sum_accepts_stream_of_int" + "--skip=plugins::stream::sum_big_stream") #:features '("extra") + #:install-source? #f #:cargo-inputs - (("rust-ctrlc" ,rust-ctrlc-3) - ("rust-futures" ,rust-futures-0.3) - ("rust-itertools" ,rust-itertools-0.10) - ("rust-mp4" ,rust-mp4-0.9) - ("rust-nu-cli" ,rust-nu-cli-0.44) - ("rust-nu-command" ,rust-nu-command-0.44) - ("rust-nu-completion" ,rust-nu-completion-0.44) - ("rust-nu-data" ,rust-nu-data-0.44) - ("rust-nu-engine" ,rust-nu-engine-0.44) - ("rust-nu-errors" ,rust-nu-errors-0.44) - ("rust-nu-parser" ,rust-nu-parser-0.44) - ("rust-nu-path" ,rust-nu-path-0.44) - ("rust-nu-plugin" ,rust-nu-plugin-0.44) - ("rust-nu-protocol" ,rust-nu-protocol-0.44) - ("rust-nu-source" ,rust-nu-source-0.44) - ("rust-nu-value-ext" ,rust-nu-value-ext-0.44) - ("rust-nu-plugin-binaryview" ,rust-nu-plugin-binaryview-0.44) - ("rust-nu-plugin-chart" ,rust-nu-plugin-chart-0.44) - ("rust-nu-plugin-from-bson" ,rust-nu-plugin-from-bson-0.44) - ("rust-nu-plugin-from-sqlite" ,rust-nu-plugin-from-sqlite-0.44) - ("rust-nu-plugin-inc" ,rust-nu-plugin-inc-0.44) - ("rust-nu-plugin-match" ,rust-nu-plugin-match-0.44) - ("rust-nu-plugin-query-json" ,rust-nu-plugin-query-json-0.44) - ("rust-nu-plugin-s3" ,rust-nu-plugin-s3-0.44) - ("rust-nu-plugin-selector" ,rust-nu-plugin-selector-0.44) - ("rust-nu-plugin-start" ,rust-nu-plugin-start-0.44) - ("rust-nu-plugin-textview" ,rust-nu-plugin-textview-0.44) - ("rust-nu-plugin-to-bson" ,rust-nu-plugin-to-bson-0.44) - ("rust-nu-plugin-to-sqlite" ,rust-nu-plugin-to-sqlite-0.44) - ("rust-nu-plugin-tree" ,rust-nu-plugin-tree-0.44) - ("rust-nu-plugin-xpath" ,rust-nu-plugin-xpath-0.44)) + (("rust-crossterm" ,rust-crossterm-0.27) + ("rust-ctrlc" ,rust-ctrlc-3) + ("rust-log" ,rust-log-0.4) + ("rust-miette" ,rust-miette-7) + ("rust-mimalloc" ,rust-mimalloc-0.1) + ("rust-nix" ,rust-nix-0.27) + ("rust-nu-cli" ,rust-nu-cli-0.91) + ("rust-nu-cmd-base" ,rust-nu-cmd-base-0.91) + ("rust-nu-cmd-dataframe" ,rust-nu-cmd-dataframe-0.91) + ("rust-nu-cmd-extra" ,rust-nu-cmd-extra-0.91) + ("rust-nu-cmd-lang" ,rust-nu-cmd-lang-0.91) + ("rust-nu-command" ,rust-nu-command-0.91) + ("rust-nu-engine" ,rust-nu-engine-0.91) + ("rust-nu-explore" ,rust-nu-explore-0.91) + ("rust-nu-lsp" ,rust-nu-lsp-0.91) + ("rust-nu-parser" ,rust-nu-parser-0.91) + ("rust-nu-path" ,rust-nu-path-0.91) + ("rust-nu-plugin" ,rust-nu-plugin-0.91) + ("rust-nu-protocol" ,rust-nu-protocol-0.91) + ("rust-nu-std" ,rust-nu-std-0.91) + ("rust-nu-utils" ,rust-nu-utils-0.91) + ("rust-openssl" ,rust-openssl-0.10) + ("rust-reedline" ,rust-reedline-0.30) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-simplelog" ,rust-simplelog-0.12) + ("rust-time" ,rust-time-0.3) + ("rust-winresource" ,rust-winresource-0.1)) #:cargo-development-inputs - (("rust-hamcrest2" ,rust-hamcrest2-0.3) - ("rust-nu-test-support" ,rust-nu-test-support-0.44) - ("rust-rstest" ,rust-rstest-0.10) - ("rust-serial-test" ,rust-serial-test-0.5)))) - (native-inputs - (list pkg-config python)) - (inputs - (list curl - libgit2 - libx11 - libxcb - openssl - zlib)) + (("rust-assert-cmd" ,rust-assert-cmd-2) + ("rust-divan" ,rust-divan-0.1) + ("rust-nu-test-support" ,rust-nu-test-support-0.91) + ("rust-pretty-assertions" ,rust-pretty-assertions-1) + ("rust-rstest" ,rust-rstest-0.18) + ("rust-serial-test" ,rust-serial-test-3) + ("rust-tempfile" ,rust-tempfile-3)))) + (native-inputs (list pkg-config)) + (inputs (list mimalloc openssl)) (home-page "https://www.nushell.sh") (synopsis "Shell with a structured approach to the command line") (description @@ -1039,8 +1133,33 @@ directory. These values can be piped through a series of steps, in a series of commands called a ``pipeline''.") (license license:expat))) +(define-public rust-nu-ansi-term-0.50 + (package + (name "rust-nu-ansi-term") + (version "0.50.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "nu-ansi-term" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "057zhc62hcaxc73zfjwq7gir5bfilmx652hnh9krdp0babhh0a6x")))) + (build-system cargo-build-system) + (arguments + `(#:cargo-inputs (("rust-serde" ,rust-serde-1) + ("rust-windows-sys" ,rust-windows-sys-0.48)) + #:cargo-development-inputs (("rust-doc-comment" ,rust-doc-comment-0.3) + ("rust-serde-json" ,rust-serde-json-1)))) + (home-page "https://github.com/nushell/nu-ansi-term") + (synopsis "Library for ANSI terminal colors and styles (bold, underline)") + (description + "This package is a library for ANSI terminal colors and styles (bold, +underline).") + (license license:expat))) + (define-public rust-nu-ansi-term-0.49 (package + (inherit rust-nu-ansi-term-0.50) (name "rust-nu-ansi-term") (version "0.49.0") (source @@ -1050,20 +1169,13 @@ of commands called a ``pipeline''.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "0s2svfnircd9jp06wk55qcbb9v5cadkfcjfg99vm21qdjg0x6wy0")))) - (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-serde" ,rust-serde-1) ("rust-windows-sys" ,rust-windows-sys-0.48)) #:cargo-development-inputs (("rust-doc-comment" ,rust-doc-comment-0.3) - ("rust-serde-json" ,rust-serde-json-1)))) - (home-page "https://www.nushell.sh") - (synopsis "Library for ANSI terminal colors and styles (bold, underline)") - (description - "This package is a library for ANSI terminal colors and styles (bold, -underline).") - (license license:expat))) + ("rust-serde-json" ,rust-serde-json-1)))))) (define-public rust-nu-ansi-term-0.46 (package @@ -1107,1063 +1219,803 @@ underline).") ("rust-serde" ,rust-serde-1) ("rust-winapi" ,rust-winapi-0.3)))))) -(define-public rust-nu-cli-0.44 +(define-public rust-nu-cli-0.91 (package (name "rust-nu-cli") - (version "0.44.0") + (version "0.91.0") (source (origin (method url-fetch) (uri (crate-uri "nu-cli" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0p085vgkzrczdz6ana9bb4r9hrcjm1hgr8f3885ik6kjlwiy5ixa")))) + (base32 "1v7xz13n5gzhwkn4d8wq1v22zbdvfqd2zxnqf2q3k8cnnj51ql63")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-ctrlc" ,rust-ctrlc-3) - ("rust-indexmap" ,rust-indexmap-1) - ("rust-lazy-static" ,rust-lazy-static-1) - ("rust-log" ,rust-log-0.4) - ("rust-nu-ansi-term" ,rust-nu-ansi-term-0.44) - ("rust-nu-command" ,rust-nu-command-0.44) - ("rust-nu-completion" ,rust-nu-completion-0.44) - ("rust-nu-data" ,rust-nu-data-0.44) - ("rust-nu-engine" ,rust-nu-engine-0.44) - ("rust-nu-errors" ,rust-nu-errors-0.44) - ("rust-nu-parser" ,rust-nu-parser-0.44) - ("rust-nu-path" ,rust-nu-path-0.44) - ("rust-nu-protocol" ,rust-nu-protocol-0.44) - ("rust-nu-source" ,rust-nu-source-0.44) - ("rust-nu-stream" ,rust-nu-stream-0.44) - ("rust-pretty-env-logger" ,rust-pretty-env-logger-0.4) - ("rust-rustyline" ,rust-rustyline-9) - ("rust-serde" ,rust-serde-1) - ("rust-serde-yaml" ,rust-serde-yaml-0.8) - ("rust-shadow-rs" ,rust-shadow-rs-0.8) - ("rust-shadow-rs" ,rust-shadow-rs-0.8) - ("rust-strip-ansi-escapes" ,rust-strip-ansi-escapes-0.1)))) - (home-page "https://www.nushell.sh") - (synopsis "CLI for nushell") - (description "CLI for nushell") - (license license:expat))) - -(define-public rust-nu-command-0.44 - (package - (name "rust-nu-command") - (version "0.44.0") - (source - (origin - (method url-fetch) - (uri (crate-uri "nu-command" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 "1h62df48z8vji10jsmpcfrgbr404kvsl1i3p5gns5gg9wscbpp8f")))) - (build-system cargo-build-system) - (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-base64" ,rust-base64-0.13) - ("rust-bigdecimal" ,rust-bigdecimal-0.3) - ("rust-calamine" ,rust-calamine-0.18) - ("rust-chrono" ,rust-chrono-0.4) - ("rust-chrono-tz" ,rust-chrono-tz-0.5) - ("rust-crossterm" ,rust-crossterm-0.19) - ("rust-csv" ,rust-csv-1) - ("rust-ctrlc" ,rust-ctrlc-3) - ("rust-derive-new" ,rust-derive-new-0.5) - ("rust-digest" ,rust-digest-0.9) - ("rust-dirs-next" ,rust-dirs-next-2) - ("rust-dtparse" ,rust-dtparse-1) - ("rust-eml-parser" ,rust-eml-parser-0.1) - ("rust-encoding-rs" ,rust-encoding-rs-0.8) - ("rust-filesize" ,rust-filesize-0.2) - ("rust-futures" ,rust-futures-0.3) - ("rust-glob" ,rust-glob-0.3) - ("rust-heck" ,rust-heck-0.4) - ("rust-htmlescape" ,rust-htmlescape-0.3) - ("rust-ical" ,rust-ical-0.7) - ("rust-indexmap" ,rust-indexmap-1) - ("rust-itertools" ,rust-itertools-0.10) - ("rust-lazy-static" ,rust-lazy-static-1) - ("rust-log" ,rust-log-0.4) - ("rust-md-5" ,rust-md-5-0.9) - ("rust-meval" ,rust-meval-0.2) - ("rust-mime" ,rust-mime-0.3) - ("rust-nu-ansi-term" ,rust-nu-ansi-term-0.44) - ("rust-nu-data" ,rust-nu-data-0.44) - ("rust-nu-engine" ,rust-nu-engine-0.44) - ("rust-nu-errors" ,rust-nu-errors-0.44) - ("rust-nu-json" ,rust-nu-json-0.44) - ("rust-nu-parser" ,rust-nu-parser-0.44) - ("rust-nu-path" ,rust-nu-path-0.44) - ("rust-nu-plugin" ,rust-nu-plugin-0.44) - ("rust-nu-pretty-hex" ,rust-nu-pretty-hex-0.44) - ("rust-nu-protocol" ,rust-nu-protocol-0.44) - ("rust-nu-serde" ,rust-nu-serde-0.44) - ("rust-nu-source" ,rust-nu-source-0.44) - ("rust-nu-stream" ,rust-nu-stream-0.44) - ("rust-nu-table" ,rust-nu-table-0.44) - ("rust-nu-test-support" ,rust-nu-test-support-0.44) - ("rust-nu-value-ext" ,rust-nu-value-ext-0.44) - ("rust-num-bigint" ,rust-num-bigint-0.4) - ("rust-num-format" ,rust-num-format-0.4) - ("rust-num-traits" ,rust-num-traits-0.2) - ("rust-parking-lot" ,rust-parking-lot-0.11) - ("rust-polars" ,rust-polars-0.17) - ("rust-quick-xml" ,rust-quick-xml-0.22) - ("rust-quickcheck-macros" ,rust-quickcheck-macros-1) - ("rust-rand" ,rust-rand-0.8) - ("rust-regex" ,rust-regex-1) - ("rust-reqwest" ,rust-reqwest-0.11) - ("rust-roxmltree" ,rust-roxmltree-0.14) - ("rust-rust-embed" ,rust-rust-embed-5) - ("rust-rustyline" ,rust-rustyline-9) - ("rust-serde" ,rust-serde-1) - ("rust-serde-ini" ,rust-serde-ini-0.2) - ("rust-serde-json" ,rust-serde-json-1) - ("rust-serde-urlencoded" ,rust-serde-urlencoded-0.7) - ("rust-serde-yaml" ,rust-serde-yaml-0.8) - ("rust-sha2" ,rust-sha2-0.9) - ("rust-shadow-rs" ,rust-shadow-rs-0.8) - ("rust-strip-ansi-escapes" ,rust-strip-ansi-escapes-0.1) - ("rust-sysinfo" ,rust-sysinfo-0.23) - ("rust-term" ,rust-term-0.7) - ("rust-term-size" ,rust-term-size-0.3) - ("rust-thiserror" ,rust-thiserror-1) - ("rust-titlecase" ,rust-titlecase-1) - ("rust-tokio" ,rust-tokio-1) - ("rust-toml" ,rust-toml-0.5) - ("rust-trash" ,rust-trash-2) - ("rust-umask" ,rust-umask-1) - ("rust-unicode-segmentation" ,rust-unicode-segmentation-1) - ("rust-url" ,rust-url-2) - ("rust-users" ,rust-users-0.11) - ("rust-uuid" ,rust-uuid-0.8) - ("rust-which" ,rust-which-4) - ("rust-zip" ,rust-zip-0.5)))) - (home-page "https://www.nushell.sh") - (synopsis "CLI for nushell") - (description "CLI for nushell") - (license license:expat))) - -(define-public rust-nu-completion-0.44 - (package - (name "rust-nu-completion") - (version "0.44.0") - (source - (origin - (method url-fetch) - (uri (crate-uri "nu-completion" version)) - (file-name - (string-append name "-" version ".tar.gz")) - (sha256 - (base32 - "0pp3949cckivl57cqmcm5cc4pd6z8syyrbankk32vwlm0v4yly0q")))) - (build-system cargo-build-system) - (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-indexmap" ,rust-indexmap-1) - ("rust-is-executable" ,rust-is-executable-1) - ("rust-nu-data" ,rust-nu-data-0.44) - ("rust-nu-engine" ,rust-nu-engine-0.44) - ("rust-nu-parser" ,rust-nu-parser-0.44) - ("rust-nu-path" ,rust-nu-path-0.44) - ("rust-nu-protocol" ,rust-nu-protocol-0.44) - ("rust-nu-source" ,rust-nu-source-0.44) - ("rust-nu-test-support" ,rust-nu-test-support-0.44)))) - (home-page "https://www.nushell.sh") - (synopsis "Completions for nushell") - (description "Completions for nushell") - (license license:expat))) - -(define-public rust-nu-data-0.44 - (package - (name "rust-nu-data") - (version "0.44.0") - (source - (origin - (method url-fetch) - (uri (crate-uri "nu-data" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 "1kjyp63fr18rym2xvfqpyw4z0z1j8ckf2aszfk1a4z0pj64w6bi6")))) - (build-system cargo-build-system) - (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-bigdecimal" ,rust-bigdecimal-0.3) - ("rust-byte-unit" ,rust-byte-unit-4) - ("rust-chrono" ,rust-chrono-0.4) - ("rust-common-path" ,rust-common-path-1) - ("rust-derive-new" ,rust-derive-new-0.5) - ("rust-directories-next" ,rust-directories-next-2) - ("rust-getset" ,rust-getset-0.1) - ("rust-indexmap" ,rust-indexmap-1) - ("rust-log" ,rust-log-0.4) - ("rust-nu-ansi-term" ,rust-nu-ansi-term-0.44) - ("rust-nu-errors" ,rust-nu-errors-0.44) - ("rust-nu-path" ,rust-nu-path-0.44) - ("rust-nu-protocol" ,rust-nu-protocol-0.44) - ("rust-nu-source" ,rust-nu-source-0.44) - ("rust-nu-table" ,rust-nu-table-0.44) - ("rust-nu-test-support" ,rust-nu-test-support-0.44) - ("rust-nu-value-ext" ,rust-nu-value-ext-0.44) - ("rust-num-bigint" ,rust-num-bigint-0.4) - ("rust-num-format" ,rust-num-format-0.4) - ("rust-num-traits" ,rust-num-traits-0.2) - ("rust-serde" ,rust-serde-1) - ("rust-sha2" ,rust-sha2-0.9) - ("rust-sys-locale" ,rust-sys-locale-0.1) - ("rust-toml" ,rust-toml-0.5)))) - (home-page "https://www.nushell.sh") - (synopsis "CLI for nushell") - (description "CLI for nushell") - (license license:expat))) - -(define-public rust-nu-engine-0.44 - (package - (name "rust-nu-engine") - (version "0.44.0") - (source - (origin - (method url-fetch) - (uri (crate-uri "nu-engine" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 "0ry9x0ji4dikvd7vq4x9l1iqjwdhm80gcsvhfi7d0c26nvw8kpiz")))) - (build-system cargo-build-system) - (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-bigdecimal" ,rust-bigdecimal-0.3) - ("rust-bytes" ,rust-bytes-1) - ("rust-chrono" ,rust-chrono-0.4) - ("rust-codespan-reporting" ,rust-codespan-reporting-0.11) - ("rust-derive-new" ,rust-derive-new-0.5) - ("rust-dirs-next" ,rust-dirs-next-2) - ("rust-encoding-rs" ,rust-encoding-rs-0.8) - ("rust-filesize" ,rust-filesize-0.2) - ("rust-fs-extra" ,rust-fs-extra-1) - ("rust-getset" ,rust-getset-0.1) - ("rust-glob" ,rust-glob-0.3) - ("rust-indexmap" ,rust-indexmap-1) - ("rust-itertools" ,rust-itertools-0.10) - ("rust-lazy-static" ,rust-lazy-static-1) - ("rust-log" ,rust-log-0.4) - ("rust-nu-ansi-term" ,rust-nu-ansi-term-0.44) - ("rust-nu-data" ,rust-nu-data-0.44) - ("rust-nu-errors" ,rust-nu-errors-0.44) - ("rust-nu-parser" ,rust-nu-parser-0.44) - ("rust-nu-path" ,rust-nu-path-0.44) - ("rust-nu-plugin" ,rust-nu-plugin-0.44) - ("rust-nu-protocol" ,rust-nu-protocol-0.44) - ("rust-nu-source" ,rust-nu-source-0.44) - ("rust-nu-stream" ,rust-nu-stream-0.44) - ("rust-nu-test-support" ,rust-nu-test-support-0.44) - ("rust-nu-value-ext" ,rust-nu-value-ext-0.44) - ("rust-num-bigint" ,rust-num-bigint-0.4) - ("rust-parking-lot" ,rust-parking-lot-0.11) - ("rust-rayon" ,rust-rayon-1) - ("rust-serde" ,rust-serde-1) - ("rust-serde-json" ,rust-serde-json-1) - ("rust-tempfile" ,rust-tempfile-3) - ("rust-term-size" ,rust-term-size-0.3) - ("rust-termcolor" ,rust-termcolor-1) - ("rust-trash" ,rust-trash-2) - ("rust-umask" ,rust-umask-1) - ("rust-users" ,rust-users-0.11) - ("rust-which" ,rust-which-4)))) - (home-page "https://www.nushell.sh") - (synopsis "Core commands for nushell") - (description "Core commands for nushell") - (license license:expat))) - -(define-public rust-nu-errors-0.44 - (package - (name "rust-nu-errors") - (version "0.44.0") - (source - (origin - (method url-fetch) - (uri (crate-uri "nu-errors" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 "1cd5rkqlhgab6hb1q31xqbrb0j9wbmwzp9z20rrsc59s5zajiivq")))) - (build-system cargo-build-system) - (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-bigdecimal" ,rust-bigdecimal-0.3) - ("rust-codespan-reporting" ,rust-codespan-reporting-0.11) - ("rust-derive-new" ,rust-derive-new-0.5) - ("rust-getset" ,rust-getset-0.1) - ("rust-glob" ,rust-glob-0.3) - ("rust-nu-ansi-term" ,rust-nu-ansi-term-0.44) - ("rust-nu-source" ,rust-nu-source-0.44) - ("rust-num-bigint" ,rust-num-bigint-0.4) - ("rust-num-traits" ,rust-num-traits-0.2) - ("rust-serde" ,rust-serde-1) - ("rust-serde-json" ,rust-serde-json-1) - ("rust-serde-yaml" ,rust-serde-yaml-0.8) - ("rust-toml" ,rust-toml-0.5)))) - (home-page "https://www.nushell.sh") - (synopsis "Core error subsystem for Nushell") - (description "Core error subsystem for Nushell") - (license license:expat))) - -(define-public rust-nu-json-0.44 - (package - (name "rust-nu-json") - (version "0.44.0") - (source - (origin - (method url-fetch) - (uri (crate-uri "nu-json" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 "0vdp2brhiyvrkqd1127cixwdcqqmbhf7qha4jyx1ki4hh7w86l0b")))) - (build-system cargo-build-system) - (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-lazy-static" ,rust-lazy-static-1) - ("rust-linked-hash-map" ,rust-linked-hash-map-0.5) - ("rust-num-traits" ,rust-num-traits-0.2) - ("rust-regex" ,rust-regex-1) - ("rust-serde" ,rust-serde-1)))) - (home-page "https://www.nushell.sh") - (synopsis "Fork of @code{serde-hjson}") - (description "This package is a fork of @code{serde-hjson}.") - (license license:expat))) - -(define-public rust-nu-parser-0.44 - (package - (name "rust-nu-parser") - (version "0.44.0") - (source - (origin - (method url-fetch) - (uri (crate-uri "nu-parser" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 "1n4223kb9gnwmfhn4als68y1b2niw2zkl8wkra8622gm7p116xq6")))) - (build-system cargo-build-system) - (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-bigdecimal" ,rust-bigdecimal-0.3) - ("rust-derive-new" ,rust-derive-new-0.5) - ("rust-indexmap" ,rust-indexmap-1) - ("rust-itertools" ,rust-itertools-0.10) - ("rust-log" ,rust-log-0.4) - ("rust-nu-data" ,rust-nu-data-0.44) - ("rust-nu-errors" ,rust-nu-errors-0.44) - ("rust-nu-path" ,rust-nu-path-0.44) - ("rust-nu-protocol" ,rust-nu-protocol-0.44) - ("rust-nu-source" ,rust-nu-source-0.44) - ("rust-nu-test-support" ,rust-nu-test-support-0.44) - ("rust-num-bigint" ,rust-num-bigint-0.4) - ("rust-smart-default" ,rust-smart-default-0.6)))) - (home-page "https://www.nushell.sh") - (synopsis "Nushell parser") - (description "Nushell parser") - (license license:expat))) - -(define-public rust-nu-path-0.44 - (package - (name "rust-nu-path") - (version "0.44.0") - (source - (origin - (method url-fetch) - (uri (crate-uri "nu-path" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 "069df6ikkaimcr1pjiycfr3ma6sjmb4ajmyxqdckckaqx4nj5wqk")))) - (build-system cargo-build-system) - (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-dirs-next" ,rust-dirs-next-2) ("rust-dunce" ,rust-dunce-1)))) - (home-page "https://www.nushell.sh") - (synopsis "Nushell parser") - (description "Nushell parser") - (license license:expat))) - -(define-public rust-nu-plugin-0.44 - (package - (name "rust-nu-plugin") - (version "0.44.0") - (source - (origin - (method url-fetch) - (uri (crate-uri "nu-plugin" version)) - (file-name - (string-append name "-" version ".tar.gz")) - (sha256 - (base32 "0vs4f84krf859j9f9rqzggzq3i49gb84928l22ddshdsspynckmj")))) - (build-system cargo-build-system) - (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-indexmap" ,rust-indexmap-1) - ("rust-nu-errors" ,rust-nu-errors-0.44) - ("rust-nu-protocol" ,rust-nu-protocol-0.44) - ("rust-nu-source" ,rust-nu-source-0.44) - ("rust-nu-test-support" ,rust-nu-test-support-0.44) - ("rust-nu-value-ext" ,rust-nu-value-ext-0.44) - ("rust-serde" ,rust-serde-1) - ("rust-serde-json" ,rust-serde-json-1)))) - (home-page "https://www.nushell.sh") - (synopsis "Nushell Plugin") - (description "Nushell Plugin") - (license license:expat))) - -(define-public rust-nu-plugin-binaryview-0.44 - (package - (name "rust-nu-plugin-binaryview") - (version "0.44.0") - (source - (origin - (method url-fetch) - (uri (crate-uri "nu_plugin_binaryview" version)) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 "1zk49hfp21akf6x7ml4b3h61y7jrj5i03zdmikci981idqm2fivm")))) - (build-system cargo-build-system) - (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-crossterm" ,rust-crossterm-0.19) - ("rust-image" ,rust-image-0.23) - ("rust-neso" ,rust-neso-0.5) - ("rust-nu-ansi-term" ,rust-nu-ansi-term-0.44) - ("rust-nu-errors" ,rust-nu-errors-0.44) - ("rust-nu-plugin" ,rust-nu-plugin-0.44) - ("rust-nu-pretty-hex" ,rust-nu-pretty-hex-0.44) - ("rust-nu-protocol" ,rust-nu-protocol-0.44) - ("rust-nu-source" ,rust-nu-source-0.44) - ("rust-rawkey" ,rust-rawkey-0.1)))) - (home-page "https://www.nushell.sh") - (synopsis "Binary viewer plugin for Nushell") - (description - "This package provides a binary viewer plugin for Nushell.") + `(#:tests? #f ; 42 of 45 of the completions tests fail. + #:cargo-inputs (("rust-chrono" ,rust-chrono-0.4) + ("rust-crossterm" ,rust-crossterm-0.27) + ("rust-fancy-regex" ,rust-fancy-regex-0.13) + ("rust-fuzzy-matcher" ,rust-fuzzy-matcher-0.3) + ("rust-is-executable" ,rust-is-executable-1) + ("rust-log" ,rust-log-0.4) + ("rust-lscolors" ,rust-lscolors-0.17) + ("rust-miette" ,rust-miette-7) + ("rust-nu-ansi-term" ,rust-nu-ansi-term-0.50) + ("rust-nu-cmd-base" ,rust-nu-cmd-base-0.91) + ("rust-nu-color-config" ,rust-nu-color-config-0.91) + ("rust-nu-engine" ,rust-nu-engine-0.91) + ("rust-nu-parser" ,rust-nu-parser-0.91) + ("rust-nu-path" ,rust-nu-path-0.91) + ("rust-nu-protocol" ,rust-nu-protocol-0.91) + ("rust-nu-utils" ,rust-nu-utils-0.91) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-pathdiff" ,rust-pathdiff-0.2) + ("rust-percent-encoding" ,rust-percent-encoding-2) + ("rust-reedline" ,rust-reedline-0.30) + ("rust-sysinfo" ,rust-sysinfo-0.30) + ("rust-unicode-segmentation" ,rust-unicode-segmentation-1) + ("rust-uuid" ,rust-uuid-1) + ("rust-which" ,rust-which-6)) + #:cargo-development-inputs + (("rust-nu-cmd-lang" ,rust-nu-cmd-lang-0.91) + ("rust-nu-command" ,rust-nu-command-0.91) + ("rust-nu-test-support" ,rust-nu-test-support-0.91) + ("rust-rstest" ,rust-rstest-0.18)))) + (native-inputs (list pkg-config)) + (inputs (list openssl)) + (home-page "https://github.com/nushell/nushell/tree/main/crates/nu-cli") + (synopsis "CLI-related functionality for Nushell") + (description "This package provides CLI-related functionality for Nushell.") (license license:expat))) -(define-public rust-nu-plugin-chart-0.44 +(define-public rust-nu-cmd-base-0.91 (package - (name "rust-nu-plugin-chart") - (version "0.44.0") + (name "rust-nu-cmd-base") + (version "0.91.0") (source (origin (method url-fetch) - (uri (crate-uri "nu_plugin_chart" version)) + (uri (crate-uri "nu-cmd-base" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "05nv8c1650w8bh71s7yl35ybbjky6b4vdwkw0ywanhm1nqziva7s")))) + (base32 "0i2bdvhl1qmpzrip4b45xr4vg0himfsi120xq5al9vs5y80x2lla")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-crossterm" ,rust-crossterm-0.19) - ("rust-nu-data" ,rust-nu-data-0.44) - ("rust-nu-errors" ,rust-nu-errors-0.44) - ("rust-nu-plugin" ,rust-nu-plugin-0.44) - ("rust-nu-protocol" ,rust-nu-protocol-0.44) - ("rust-nu-source" ,rust-nu-source-0.44) - ("rust-nu-value-ext" ,rust-nu-value-ext-0.44) - ("rust-tui" ,rust-tui-0.15)))) - (home-page "https://www.nushell.sh") - (synopsis "Plugin to display charts") + `(#:cargo-inputs (("rust-indexmap" ,rust-indexmap-2) + ("rust-miette" ,rust-miette-7) + ("rust-nu-engine" ,rust-nu-engine-0.91) + ("rust-nu-parser" ,rust-nu-parser-0.91) + ("rust-nu-path" ,rust-nu-path-0.91) + ("rust-nu-protocol" ,rust-nu-protocol-0.91)))) + (home-page + "https://github.com/nushell/nushell/tree/main/crates/nu-cmd-base") + (synopsis "Foundation tools to build Nushell commands") (description - "This package provides a plugin to display charts in Nushell.") + "This package provides the foundation tools to build Nushell commands.") (license license:expat))) -(define-public rust-nu-plugin-from-bson-0.44 +(define-public rust-nu-cmd-dataframe-0.91 (package - (name "rust-nu-plugin-from-bson") - (version "0.44.0") + (name "rust-nu-cmd-dataframe") + (version "0.91.0") (source (origin (method url-fetch) - (uri (crate-uri "nu_plugin_from_bson" version)) + (uri (crate-uri "nu-cmd-dataframe" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1hmkqiqyqiin80fmlb31r6dgpif8r9nlda4w8ihzjflsbxnmp6wd")))) + (base32 "1avsx50kr0snbm62l91v7a7wfq05igv5aagwhczm1g4xdpl448x9")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-bigdecimal" ,rust-bigdecimal-0.3) - ("rust-bson" ,rust-bson-2) - ("rust-nu-errors" ,rust-nu-errors-0.44) - ("rust-nu-plugin" ,rust-nu-plugin-0.44) - ("rust-nu-protocol" ,rust-nu-protocol-0.44) - ("rust-nu-source" ,rust-nu-source-0.44)))) - (home-page "https://www.nushell.sh") - (synopsis "Converter plugin to the bson format for Nushell") + `(#:cargo-inputs (("rust-chrono" ,rust-chrono-0.4) + ("rust-chrono-tz" ,rust-chrono-tz-0.8) + ("rust-fancy-regex" ,rust-fancy-regex-0.13) + ("rust-indexmap" ,rust-indexmap-2) + ("rust-nu-engine" ,rust-nu-engine-0.91) + ("rust-nu-parser" ,rust-nu-parser-0.91) + ("rust-nu-protocol" ,rust-nu-protocol-0.91) + ("rust-num" ,rust-num-0.4) + ("rust-polars" ,rust-polars-0.37) + ("rust-polars-arrow" ,rust-polars-arrow-0.37) + ("rust-polars-io" ,rust-polars-io-0.37) + ("rust-polars-ops" ,rust-polars-ops-0.37) + ("rust-polars-plan" ,rust-polars-plan-0.37) + ("rust-polars-utils" ,rust-polars-utils-0.37) + ("rust-serde" ,rust-serde-1) + ("rust-sqlparser" ,rust-sqlparser-0.43)) + #:cargo-development-inputs (("rust-nu-cmd-lang" ,rust-nu-cmd-lang-0.91)))) + (home-page + "https://github.com/nushell/nushell/tree/main/crates/nu-cmd-dataframe") + (synopsis "Nushell's dataframe commands based on polars") (description - "This package provides a converter plugin to the bson format for -Nushell.") + "This package contains nushell's dataframe commands based on polars.") (license license:expat))) -(define-public rust-nu-plugin-from-sqlite-0.44 +(define-public rust-nu-cmd-extra-0.91 (package - (name "rust-nu-plugin-from-sqlite") - (version "0.44.0") + (name "rust-nu-cmd-extra") + (version "0.91.0") (source (origin (method url-fetch) - (uri (crate-uri "nu_plugin_from_sqlite" version)) + (uri (crate-uri "nu-cmd-extra" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "11dirmm78n6jwsq8qihx3sbjfa0j7s9ffl1j03v8f4zzfvsypxxb")))) + (base32 "0x905m6yci5n3ir89arq7vdvx0czqpjvr3j8i32f7bqh0z3jisc3")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-bigdecimal" ,rust-bigdecimal-0.3) - ("rust-nu-errors" ,rust-nu-errors-0.44) - ("rust-nu-plugin" ,rust-nu-plugin-0.44) - ("rust-nu-protocol" ,rust-nu-protocol-0.44) - ("rust-nu-source" ,rust-nu-source-0.44) - ("rust-rusqlite" ,rust-rusqlite-0.26) - ("rust-tempfile" ,rust-tempfile-3)))) - (home-page "https://www.nushell.sh") - (synopsis "Converter plugin to the bson format for Nushell") - (description - "This package provides a converter plugin to the bson format for -Nushell.") + `(#:cargo-inputs (("rust-fancy-regex" ,rust-fancy-regex-0.13) + ("rust-heck" ,rust-heck-0.4) + ("rust-itertools" ,rust-itertools-0.12) + ("rust-nu-ansi-term" ,rust-nu-ansi-term-0.50) + ("rust-nu-cmd-base" ,rust-nu-cmd-base-0.91) + ("rust-nu-engine" ,rust-nu-engine-0.91) + ("rust-nu-json" ,rust-nu-json-0.91) + ("rust-nu-parser" ,rust-nu-parser-0.91) + ("rust-nu-pretty-hex" ,rust-nu-pretty-hex-0.91) + ("rust-nu-protocol" ,rust-nu-protocol-0.91) + ("rust-nu-utils" ,rust-nu-utils-0.91) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-rust-embed" ,rust-rust-embed-8) + ("rust-serde" ,rust-serde-1) + ("rust-serde-urlencoded" ,rust-serde-urlencoded-0.7) + ("rust-v-htmlescape" ,rust-v-htmlescape-0.15)) + #:cargo-development-inputs + (("rust-nu-cmd-lang" ,rust-nu-cmd-lang-0.91) + ("rust-nu-command" ,rust-nu-command-0.91) + ("rust-nu-test-support" ,rust-nu-test-support-0.91)))) + (native-inputs (list pkg-config)) + (inputs (list openssl)) + (home-page + "https://github.com/nushell/nushell/tree/main/crates/nu-cmd-extra") + (synopsis "Nushell's extra commands") + (description "This package contains nushell's extra commands that are not +part of the 1.0 api standard.") (license license:expat))) -(define-public rust-nu-plugin-inc-0.44 +(define-public rust-nu-cmd-lang-0.91 (package - (name "rust-nu-plugin-inc") - (version "0.44.0") + (name "rust-nu-cmd-lang") + (version "0.91.0") (source (origin (method url-fetch) - (uri (crate-uri "nu_plugin_inc" version)) + (uri (crate-uri "nu-cmd-lang" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0gyj54ip1nl68rav3h78sjljh826cp71khmjsbsvyphhgdm1kbhw")))) + (base32 "0zwdw3y4jn6s6h41jnwljpj9cfyhr68av61idikjkhi7l6hygy5c")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-nu-errors" ,rust-nu-errors-0.44) - ("rust-nu-plugin" ,rust-nu-plugin-0.44) - ("rust-nu-protocol" ,rust-nu-protocol-0.44) - ("rust-nu-source" ,rust-nu-source-0.44) - ("rust-nu-test-support" ,rust-nu-test-support-0.44) - ("rust-nu-value-ext" ,rust-nu-value-ext-0.44) - ("rust-semver" ,rust-semver-0.11)))) - (home-page "https://www.nushell.sh") - (synopsis "Version incrementer plugin for Nushell") - (description - "This package provides a version incrementer plugin for -Nushell.") + `(#:cargo-inputs (("rust-itertools" ,rust-itertools-0.12) + ("rust-nu-engine" ,rust-nu-engine-0.91) + ("rust-nu-parser" ,rust-nu-parser-0.91) + ("rust-nu-protocol" ,rust-nu-protocol-0.91) + ("rust-nu-utils" ,rust-nu-utils-0.91) + ("rust-shadow-rs" ,rust-shadow-rs-0.26)))) + (home-page + "https://github.com/nushell/nushell/tree/main/crates/nu-cmd-lang") + (synopsis "Nushell's core language commands") + (description "This package provides nushell's core language commands.") (license license:expat))) -(define-public rust-nu-plugin-match-0.44 +(define-public rust-nu-color-config-0.91 (package - (name "rust-nu-plugin-match") - (version "0.44.0") + (name "rust-nu-color-config") + (version "0.91.0") (source (origin (method url-fetch) - (uri (crate-uri "nu_plugin_match" version)) + (uri (crate-uri "nu-color-config" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1hbs9h28qwwd8i3rb2klx2xmgcxs6l92x9dbmjx3bl85wmjk2skm")))) + (base32 "115bha7r4sy19w80vbbfc3av9g0pa1fcksdaqznm0yjlykv49czy")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-nu-errors" ,rust-nu-errors-0.44) - ("rust-nu-plugin" ,rust-nu-plugin-0.44) - ("rust-nu-protocol" ,rust-nu-protocol-0.44) - ("rust-regex" ,rust-regex-1)))) - (home-page "https://www.nushell.sh") - (synopsis "Regex match plugin for Nushell") - (description - "This package provides a regex match plugin for Nushell.") + `(#:cargo-test-flags + '("--release" "--" + "--skip=style_computer::test_computable_style_closure_basic" + "--skip=style_computer::test_computable_style_closure_errors") + #:cargo-inputs (("rust-nu-ansi-term" ,rust-nu-ansi-term-0.50) + ("rust-nu-engine" ,rust-nu-engine-0.91) + ("rust-nu-json" ,rust-nu-json-0.91) + ("rust-nu-protocol" ,rust-nu-protocol-0.91) + ("rust-serde" ,rust-serde-1)) + #:cargo-development-inputs + (("rust-nu-test-support" ,rust-nu-test-support-0.91)))) + (home-page + "https://github.com/nushell/nushell/tree/main/crates/nu-color-config") + (synopsis "Color configuration code used by Nushell") + (description "This package contains color configuration code used by Nushell.") (license license:expat))) -(define-public rust-nu-plugin-query-json-0.44 +(define-public rust-nu-command-0.91 (package - (name "rust-nu-plugin-query-json") - (version "0.44.0") + (name "rust-nu-command") + (version "0.91.0") (source (origin (method url-fetch) - (uri (crate-uri "nu_plugin_query_json" version)) + (uri (crate-uri "nu-command" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1yzcgm8sqzgr55hdcpzqrdfjc0yhz95qqpxyscm8cm6xw59ib0z2")))) + (base32 "0jiz6bndkwfnhs4cc74am8krnhyb5kyq310nf7ma5038q6vqs8q9")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-gjson" ,rust-gjson-0.8) - ("rust-nu-errors" ,rust-nu-errors-0.44) - ("rust-nu-plugin" ,rust-nu-plugin-0.44) - ("rust-nu-protocol" ,rust-nu-protocol-0.44) - ("rust-nu-source" ,rust-nu-source-0.44)))) - (home-page "https://www.nushell.sh") - (synopsis "Query JSON files with Gjson") - (description "query json files with gjson") + `(#:tests? #f ; Not all files included. + #:cargo-inputs (("rust-alphanumeric-sort" ,rust-alphanumeric-sort-1) + ("rust-base64" ,rust-base64-0.21) + ("rust-bracoxide" ,rust-bracoxide-0.1) + ("rust-byteorder" ,rust-byteorder-1) + ("rust-bytesize" ,rust-bytesize-1) + ("rust-calamine" ,rust-calamine-0.24) + ("rust-chardetng" ,rust-chardetng-0.1) + ("rust-chrono" ,rust-chrono-0.4) + ("rust-chrono-humanize" ,rust-chrono-humanize-0.2) + ("rust-chrono-tz" ,rust-chrono-tz-0.8) + ("rust-crossterm" ,rust-crossterm-0.27) + ("rust-csv" ,rust-csv-1) + ("rust-dialoguer" ,rust-dialoguer-0.11) + ("rust-digest" ,rust-digest-0.10) + ("rust-dtparse" ,rust-dtparse-2) + ("rust-encoding-rs" ,rust-encoding-rs-0.8) + ("rust-fancy-regex" ,rust-fancy-regex-0.13) + ("rust-filesize" ,rust-filesize-0.2) + ("rust-filetime" ,rust-filetime-0.2) + ("rust-fs-extra" ,rust-fs-extra-1) + ("rust-human-date-parser" ,rust-human-date-parser-0.1) + ("rust-indexmap" ,rust-indexmap-2) + ("rust-indicatif" ,rust-indicatif-0.17) + ("rust-itertools" ,rust-itertools-0.12) + ("rust-libc" ,rust-libc-0.2) + ("rust-log" ,rust-log-0.4) + ("rust-lscolors" ,rust-lscolors-0.17) + ("rust-md-5" ,rust-md-5-0.10) + ("rust-mime" ,rust-mime-0.3) + ("rust-mime-guess" ,rust-mime-guess-2) + ("rust-native-tls" ,rust-native-tls-0.2) + ("rust-nix" ,rust-nix-0.27) + ("rust-notify-debouncer-full" ,rust-notify-debouncer-full-0.3) + ("rust-nu-ansi-term" ,rust-nu-ansi-term-0.50) + ("rust-nu-cmd-base" ,rust-nu-cmd-base-0.91) + ("rust-nu-color-config" ,rust-nu-color-config-0.91) + ("rust-nu-engine" ,rust-nu-engine-0.91) + ("rust-nu-glob" ,rust-nu-glob-0.91) + ("rust-nu-json" ,rust-nu-json-0.91) + ("rust-nu-parser" ,rust-nu-parser-0.91) + ("rust-nu-path" ,rust-nu-path-0.91) + ("rust-nu-pretty-hex" ,rust-nu-pretty-hex-0.91) + ("rust-nu-protocol" ,rust-nu-protocol-0.91) + ("rust-nu-system" ,rust-nu-system-0.91) + ("rust-nu-table" ,rust-nu-table-0.91) + ("rust-nu-term-grid" ,rust-nu-term-grid-0.91) + ("rust-nu-utils" ,rust-nu-utils-0.91) + ("rust-num-format" ,rust-num-format-0.4) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-open" ,rust-open-5) + ("rust-os-pipe" ,rust-os-pipe-1) + ("rust-pathdiff" ,rust-pathdiff-0.2) + ("rust-percent-encoding" ,rust-percent-encoding-2) + ("rust-print-positions" ,rust-print-positions-0.6) + ("rust-procfs" ,rust-procfs-0.16) + ("rust-quick-xml" ,rust-quick-xml-0.31) + ("rust-rand" ,rust-rand-0.8) + ("rust-rayon" ,rust-rayon-1) + ("rust-regex" ,rust-regex-1) + ("rust-roxmltree" ,rust-roxmltree-0.19) + ("rust-rusqlite" ,rust-rusqlite-0.31) + ("rust-same-file" ,rust-same-file-1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-serde-urlencoded" ,rust-serde-urlencoded-0.7) + ("rust-serde-yaml" ,rust-serde-yaml-0.9) + ("rust-sha2" ,rust-sha2-0.10) + ("rust-sysinfo" ,rust-sysinfo-0.30) + ("rust-tabled" ,rust-tabled-0.14) + ("rust-terminal-size" ,rust-terminal-size-0.3) + ("rust-titlecase" ,rust-titlecase-2) + ("rust-toml" ,rust-toml-0.8) + ("rust-trash" ,rust-trash-3) + ("rust-umask" ,rust-umask-2) + ("rust-unicode-segmentation" ,rust-unicode-segmentation-1) + ("rust-ureq" ,rust-ureq-2) + ("rust-url" ,rust-url-2) + ("rust-uu-cp" ,rust-uu-cp-0.0.23) + ("rust-uu-mkdir" ,rust-uu-mkdir-0.0.23) + ("rust-uu-mktemp" ,rust-uu-mktemp-0.0.23) + ("rust-uu-mv" ,rust-uu-mv-0.0.23) + ("rust-uu-whoami" ,rust-uu-whoami-0.0.23) + ("rust-uuid" ,rust-uuid-1) + ("rust-v-htmlescape" ,rust-v-htmlescape-0.15) + ("rust-wax" ,rust-wax-0.6) + ("rust-which" ,rust-which-6) + ("rust-windows" ,rust-windows-0.52) + ("rust-winreg" ,rust-winreg-0.52)) + #:cargo-development-inputs + (("rust-dirs-next" ,rust-dirs-next-2) + ("rust-mockito" ,rust-mockito-1) + ("rust-nu-cmd-lang" ,rust-nu-cmd-lang-0.91) + ("rust-nu-test-support" ,rust-nu-test-support-0.91) + ("rust-quickcheck" ,rust-quickcheck-1) + ("rust-quickcheck-macros" ,rust-quickcheck-macros-1) + ("rust-rstest" ,rust-rstest-0.18)))) + (native-inputs (list pkg-config)) + (inputs (list openssl)) + (home-page + "https://github.com/nushell/nushell/tree/main/crates/nu-command") + (synopsis "Nushell's built-in commands") + (description "This package contains nushell's built-in commands.") (license license:expat))) -(define-public rust-nu-plugin-s3-0.44 +(define-public rust-nu-engine-0.91 (package - (name "rust-nu-plugin-s3") - (version "0.44.0") + (name "rust-nu-engine") + (version "0.91.0") (source (origin (method url-fetch) - (uri (crate-uri "nu_plugin_s3" version)) + (uri (crate-uri "nu-engine" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0ims4p3z48ja8ygkhcbq1a506hp8ry3ipdpgv9j7iqi833g0vgjl")))) + (base32 "0j4g3nhg9yw7nilnf3n1k4yfn5glmd3vbap1zxwzz24xw7ap62c7")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-futures" ,rust-futures-0.3) - ("rust-nu-errors" ,rust-nu-errors-0.44) - ("rust-nu-plugin" ,rust-nu-plugin-0.44) - ("rust-nu-protocol" ,rust-nu-protocol-0.44) - ("rust-nu-source" ,rust-nu-source-0.44) - ("rust-s3handler" ,rust-s3handler-0.7)))) - (home-page "https://www.nushell.sh") - (synopsis "S3 plugin for Nushell") - (description "This package is an S3 plugin for Nushell.") + `(#:cargo-inputs (("rust-nu-glob" ,rust-nu-glob-0.91) + ("rust-nu-path" ,rust-nu-path-0.91) + ("rust-nu-protocol" ,rust-nu-protocol-0.91) + ("rust-nu-utils" ,rust-nu-utils-0.91)))) + (home-page "https://github.com/nushell/nushell/tree/main/crates/nu-engine") + (synopsis "Nushell's evaluation engine") + (description "This package provides nushell's evaluation engine.") (license license:expat))) -(define-public rust-nu-plugin-selector-0.44 +(define-public rust-nu-explore-0.91 (package - (name "rust-nu-plugin-selector") - (version "0.44.0") + (name "rust-nu-explore") + (version "0.91.0") (source (origin (method url-fetch) - (uri (crate-uri "nu_plugin_selector" version)) + (uri (crate-uri "nu-explore" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1ni51yr1vndjf7c9qmvrc23nn3csv5jy14bwd8kxd5b7648aidsy")))) + (base32 "0j1xry4idjxrnyfz9l227s5hd82635dqc72gyw4zwq35izjrgqmm")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-nu-errors" ,rust-nu-errors-0.44) - ("rust-nu-plugin" ,rust-nu-plugin-0.44) - ("rust-nu-protocol" ,rust-nu-protocol-0.44) - ("rust-nu-source" ,rust-nu-source-0.44) - ("rust-scraper" ,rust-scraper-0.12)))) - (home-page "https://www.nushell.sh") - (synopsis "Web scraping using CSS selector") - (description - "This package provides web scraping using CSS selector.") + `(#:cargo-inputs (("rust-ansi-str" ,rust-ansi-str-0.8) + ("rust-crossterm" ,rust-crossterm-0.27) + ("rust-lscolors" ,rust-lscolors-0.17) + ("rust-nu-ansi-term" ,rust-nu-ansi-term-0.50) + ("rust-nu-color-config" ,rust-nu-color-config-0.91) + ("rust-nu-engine" ,rust-nu-engine-0.91) + ("rust-nu-json" ,rust-nu-json-0.91) + ("rust-nu-parser" ,rust-nu-parser-0.91) + ("rust-nu-protocol" ,rust-nu-protocol-0.91) + ("rust-nu-table" ,rust-nu-table-0.91) + ("rust-nu-utils" ,rust-nu-utils-0.91) + ("rust-ratatui" ,rust-ratatui-0.26) + ("rust-strip-ansi-escapes" ,rust-strip-ansi-escapes-0.2) + ("rust-terminal-size" ,rust-terminal-size-0.3) + ("rust-unicode-width" ,rust-unicode-width-0.1)))) + (home-page + "https://github.com/nushell/nushell/tree/main/crates/nu-explore") + (synopsis "Nushell table pager") + (description "This package contains the nushell table pager.") (license license:expat))) -(define-public rust-nu-plugin-start-0.44 +(define-public rust-nu-glob-0.91 (package - (name "rust-nu-plugin-start") - (version "0.44.0") + (name "rust-nu-glob") + (version "0.91.0") (source (origin (method url-fetch) - (uri (crate-uri "nu_plugin_start" version)) + (uri (crate-uri "nu-glob" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "028pb15y5dyywc84h79kdf0hz9l1m37djly8jhrcbj6v55x3k9h6")))) + (base32 "094jkfb7rlcl0dxs5gnw8x30zv75s372l72zsg1wmv8lblzbfybx")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-glob" ,rust-glob-0.3) - ("rust-nu-errors" ,rust-nu-errors-0.44) - ("rust-nu-errors" ,rust-nu-errors-0.44) - ("rust-nu-plugin" ,rust-nu-plugin-0.44) - ("rust-nu-protocol" ,rust-nu-protocol-0.44) - ("rust-nu-source" ,rust-nu-source-0.44) - ("rust-nu-source" ,rust-nu-source-0.44) - ("rust-open" ,rust-open-1) - ("rust-url" ,rust-url-2) - ("rust-webbrowser" ,rust-webbrowser-0.5)))) - (home-page "https://www.nushell.sh") - (synopsis "Plugin to open files/URLs directly from Nushell") + `(#:cargo-test-flags '("--release" "--" + "--skip=test::test_iteration_errors") + #:cargo-development-inputs (("rust-doc-comment" ,rust-doc-comment-0.3)))) + (home-page "https://github.com/nushell/nushell/tree/main/crates/nu-glob") + (synopsis "Support for matching file paths against Unix shell style patterns") (description - "This package provides a plugin to open files/URLs directly from -Nushell.") - (license license:expat))) + "This package provides support for matching file paths against Unix shell +style patterns.") + (license (list license:expat license:asl2.0)))) -(define-public rust-nu-plugin-textview-0.44 +(define-public rust-nu-json-0.91 (package - (name "rust-nu-plugin-textview") - (version "0.44.0") + (name "rust-nu-json") + (version "0.91.0") (source (origin (method url-fetch) - (uri (crate-uri "nu_plugin_textview" version)) + (uri (crate-uri "nu-json" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "17amhjvx1jfdz98jiavhnn18263f3hg3is7x0rkdzddng0abzpc7")))) + (base32 "1ga6kmmavd3rxjkk3j7jm6kjg2ny066a713ccca9nj0i9gbm6b1h")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-bat" ,rust-bat-0.18) - ("rust-nu-data" ,rust-nu-data-0.44) - ("rust-nu-errors" ,rust-nu-errors-0.44) - ("rust-nu-plugin" ,rust-nu-plugin-0.44) - ("rust-nu-protocol" ,rust-nu-protocol-0.44) - ("rust-nu-source" ,rust-nu-source-0.44) - ("rust-term-size" ,rust-term-size-0.3) - ("rust-url" ,rust-url-2)))) - (home-page "https://www.nushell.sh") - (synopsis "Text viewer plugin for Nushell") - (description "This package provides a text viewer plugin for -Nushell.") + `(#:cargo-inputs (("rust-linked-hash-map" ,rust-linked-hash-map-0.5) + ("rust-num-traits" ,rust-num-traits-0.2) + ("rust-serde" ,rust-serde-1)))) + (home-page "https://github.com/nushell/nushell/tree/main/crates/nu-json") + (synopsis "Human JSON (Hjson) serialization file format") + (description "This crate is a Rust library for parsing and generating Human +JSON Hjson. It is built upon Serde, a high performance generic serialization +framework.") (license license:expat))) -(define-public rust-nu-plugin-to-bson-0.44 +(define-public rust-nu-lsp-0.91 (package - (name "rust-nu-plugin-to-bson") - (version "0.44.0") + (name "rust-nu-lsp") + (version "0.91.0") (source (origin (method url-fetch) - (uri (crate-uri "nu_plugin_to_bson" version)) + (uri (crate-uri "nu-lsp" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "003x90qshcn7yv86zaw449akqvi4vz78s05g0qcgrfxgvpn7vdch")))) + (base32 "1sj61lnw74jrd7az9b5367gk4qry06s783k5vqgjznx4nqvr80xj")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-bson" ,rust-bson-2) - ("rust-nu-errors" ,rust-nu-errors-0.44) - ("rust-nu-plugin" ,rust-nu-plugin-0.44) - ("rust-nu-protocol" ,rust-nu-protocol-0.44) - ("rust-nu-source" ,rust-nu-source-0.44) - ("rust-num-traits" ,rust-num-traits-0.2)))) - (home-page "https://www.nushell.sh") - (synopsis "Converter plugin to the bson format for Nushell") - (description - "This package provides a converter plugin to the bson format for -Nushell.") + `(#:cargo-test-flags + '("--release" "--" + ;; Not all files included. + "--skip=diagnostics::tests::publish_diagnostics_fixed_unknown_variable" + "--skip=diagnostics::tests::publish_diagnostics_variable_does_not_exists" + "--skip=notification::tests::hover_correct_documentation_on_let" + "--skip=notification::tests::hover_on_command_after_full_content_change" + "--skip=notification::tests::hover_on_command_after_partial_content_change" + "--skip=notification::tests::open_document_with_utf_char" + "--skip=tests::complete_command_with_space" + "--skip=tests::complete_command_with_utf_line" + "--skip=tests::complete_on_variable" + "--skip=tests::goto_definition_of_command" + "--skip=tests::goto_definition_of_command_parameter" + "--skip=tests::goto_definition_of_variable" + "--skip=tests::hover_on_command" + "--skip=tests::hover_on_variable") + #:cargo-inputs (("rust-crossbeam-channel" ,rust-crossbeam-channel-0.5) + ("rust-lsp-server" ,rust-lsp-server-0.7) + ("rust-lsp-types" ,rust-lsp-types-0.95) + ("rust-miette" ,rust-miette-7) + ("rust-nu-cli" ,rust-nu-cli-0.91) + ("rust-nu-parser" ,rust-nu-parser-0.91) + ("rust-nu-protocol" ,rust-nu-protocol-0.91) + ("rust-reedline" ,rust-reedline-0.30) + ("rust-ropey" ,rust-ropey-1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1)) + #:cargo-development-inputs + (("rust-assert-json-diff" ,rust-assert-json-diff-2) + ("rust-nu-cmd-lang" ,rust-nu-cmd-lang-0.91) + ("rust-nu-command" ,rust-nu-command-0.91) + ("rust-nu-test-support" ,rust-nu-test-support-0.91)))) + (native-inputs (list pkg-config)) + (inputs (list openssl)) + (home-page "https://github.com/nushell/nushell/tree/main/crates/nu-lsp") + (synopsis "Nushell's integrated LSP server") + (description "This package contains nushell'e integrated LSP server.") (license license:expat))) -(define-public rust-nu-plugin-to-sqlite-0.44 +(define-public rust-nu-parser-0.91 (package - (name "rust-nu-plugin-to-sqlite") - (version "0.44.0") + (name "rust-nu-parser") + (version "0.91.0") (source (origin (method url-fetch) - (uri (crate-uri "nu_plugin_to_sqlite" version)) + (uri (crate-uri "nu-parser" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "06d93a5xgssvxrbvcv12b9jwh9xwl6sz6admbpxnk9r78lpgfdaj")))) + (base32 "110jgz6lr0bi6904k63yqbsrcgfrpn044j2xz9if8akprk4p5w4z")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-hex" ,rust-hex-0.4) - ("rust-nu-errors" ,rust-nu-errors-0.44) - ("rust-nu-plugin" ,rust-nu-plugin-0.44) - ("rust-nu-protocol" ,rust-nu-protocol-0.44) - ("rust-nu-source" ,rust-nu-source-0.44) - ("rust-rusqlite" ,rust-rusqlite-0.26) - ("rust-tempfile" ,rust-tempfile-3)))) - (home-page "https://www.nushell.sh") - (synopsis "Converter plugin to the bson format for Nushell") - (description - "This package provides a converter plugin to the bson format for -Nushell.") + `(#:cargo-inputs (("rust-bytesize" ,rust-bytesize-1) + ("rust-chrono" ,rust-chrono-0.4) + ("rust-itertools" ,rust-itertools-0.12) + ("rust-log" ,rust-log-0.4) + ("rust-nu-engine" ,rust-nu-engine-0.91) + ("rust-nu-path" ,rust-nu-path-0.91) + ("rust-nu-plugin" ,rust-nu-plugin-0.91) + ("rust-nu-protocol" ,rust-nu-protocol-0.91) + ("rust-serde-json" ,rust-serde-json-1)) + #:cargo-development-inputs (("rust-rstest" ,rust-rstest-0.18)))) + (home-page "https://github.com/nushell/nushell/tree/main/crates/nu-parser") + (synopsis "Nushell's parser") + (description "This package contains nushell's parser") (license license:expat))) -(define-public rust-nu-plugin-tree-0.44 +(define-public rust-nu-path-0.91 (package - (name "rust-nu-plugin-tree") - (version "0.44.0") + (name "rust-nu-path") + (version "0.91.0") (source (origin (method url-fetch) - (uri (crate-uri "nu_plugin_tree" version)) + (uri (crate-uri "nu-path" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "089mp7spa0fcxm45njmjcab685cv30jb0b3kkgvjp8ywwakyy8lb")))) + (base32 "146lm48vna9w5kr46dclqmzl1cbz5k7j1zz6jl8i6d83np4nn1sa")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-derive-new" ,rust-derive-new-0.5) - ("rust-nu-errors" ,rust-nu-errors-0.44) - ("rust-nu-plugin" ,rust-nu-plugin-0.44) - ("rust-nu-protocol" ,rust-nu-protocol-0.44) - ("rust-ptree" ,rust-ptree-0.4)))) - (home-page "https://www.nushell.sh") - (synopsis "Tree viewer plugin for Nushell") - (description "This package provides a tree viewer plugin for -Nushell.") + `(#:cargo-inputs (("rust-dirs-next" ,rust-dirs-next-2) + ("rust-omnipath" ,rust-omnipath-0.1) + ("rust-pwd" ,rust-pwd-1)))) + (home-page "https://github.com/nushell/nushell/tree/main/crates/nu-path") + (synopsis "Path handling library for Nushell") + (description "This package provides path handling library for Nushell.") (license license:expat))) -(define-public rust-nu-plugin-xpath-0.44 +(define-public rust-nu-plugin-0.91 (package - (name "rust-nu-plugin-xpath") - (version "0.44.0") + (name "rust-nu-plugin") + (version "0.91.0") (source (origin (method url-fetch) - (uri (crate-uri "nu_plugin_xpath" version)) + (uri (crate-uri "nu-plugin" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "18qbhibn9pz9hnilqzv2g1s51fmlwpm60ma2r6qjsa5pcy9x12dh")))) + (base32 "054hmmz78njl6qhpcbbifip5r879ipa2j3y5ndlj588b9qaijvva")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-bigdecimal" ,rust-bigdecimal-0.3) - ("rust-indexmap" ,rust-indexmap-1) - ("rust-nu-errors" ,rust-nu-errors-0.44) - ("rust-nu-plugin" ,rust-nu-plugin-0.44) - ("rust-nu-protocol" ,rust-nu-protocol-0.44) - ("rust-nu-source" ,rust-nu-source-0.44) - ("rust-sxd-document" ,rust-sxd-document-0.3) - ("rust-sxd-xpath" ,rust-sxd-xpath-0.4)))) - (home-page "https://www.nushell.sh") - (synopsis "Traverses XML") - (description "Traverses XML") + `(#:cargo-inputs (("rust-bincode" ,rust-bincode-1) + ("rust-log" ,rust-log-0.4) + ("rust-miette" ,rust-miette-7) + ("rust-nu-engine" ,rust-nu-engine-0.91) + ("rust-nu-protocol" ,rust-nu-protocol-0.91) + ("rust-rmp-serde" ,rust-rmp-serde-1) + ("rust-semver" ,rust-semver-1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-typetag" ,rust-typetag-0.2)))) + (home-page "https://github.com/nushell/nushell/tree/main/crates/nu-plugin") + (synopsis "Functionality for building Nushell plugins") + (description + "This package contains functionality for building Nushell plugins.") (license license:expat))) -(define-public rust-nu-pretty-hex-0.44 +(define-public rust-nu-pretty-hex-0.91 (package (name "rust-nu-pretty-hex") - (version "0.44.0") + (version "0.91.0") (source (origin (method url-fetch) (uri (crate-uri "nu-pretty-hex" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1dizakbxm2c6vpjy5brqbjhk8m7lr7wammibb1vr8nq85aazrj5r")))) + (base32 "1iq8amp5hqf2xxp5n74l5sgqv2bj204zwbjcnarhy88ijzjicrl6")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-heapless" ,rust-heapless-0.7) - ("rust-nu-ansi-term" ,rust-nu-ansi-term-0.44) - ("rust-rand" ,rust-rand-0.8)))) - (home-page "https://www.nushell.sh") + `(#:cargo-inputs (("rust-nu-ansi-term" ,rust-nu-ansi-term-0.50)) + #:cargo-development-inputs + (("rust-heapless" ,rust-heapless-0.8) + ("rust-rand" ,rust-rand-0.8)))) + (home-page + "https://github.com/nushell/nushell/tree/main/crates/nu-pretty-hex") (synopsis "Pretty hex dump of bytes slice in the common style") (description - "This crate provides pretty hex dump of bytes slice in the common -style.") + "This package provides pretty hex dump of bytes slice in the common style.") (license license:expat))) -(define-public rust-nu-protocol-0.44 +(define-public rust-nu-protocol-0.91 (package (name "rust-nu-protocol") - (version "0.44.0") + (version "0.91.0") (source (origin (method url-fetch) (uri (crate-uri "nu-protocol" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "1r6cnrqsq3qx3132w0p78262vql1bk446ynnfjsiffd07rmba2f7")))) + (base32 "0h6ikglmx79w5izcb7jv66s7cdsq6302pgwzyjyaxyw8jyprvx2g")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-bigdecimal" ,rust-bigdecimal-0.3) - ("rust-byte-unit" ,rust-byte-unit-4) - ("rust-chrono" ,rust-chrono-0.4) - ("rust-chrono-humanize" ,rust-chrono-humanize-0.2) - ("rust-derive-new" ,rust-derive-new-0.5) - ("rust-getset" ,rust-getset-0.1) - ("rust-indexmap" ,rust-indexmap-1) - ("rust-log" ,rust-log-0.4) - ("rust-nu-errors" ,rust-nu-errors-0.44) - ("rust-nu-source" ,rust-nu-source-0.44) - ("rust-num-bigint" ,rust-num-bigint-0.4) - ("rust-num-integer" ,rust-num-integer-0.1) - ("rust-num-traits" ,rust-num-traits-0.2) - ("rust-polars" ,rust-polars-0.17) - ("rust-serde" ,rust-serde-1) - ("rust-serde-bytes" ,rust-serde-bytes-0.11)))) - (home-page "https://www.nushell.sh") - (synopsis "Core values and protocols for Nushell") - (description "Core values and protocols for Nushell") + `(#:cargo-test-flags + '("--release" "--" + ;; Not all files included. + "--skip=config_add_unsupported_key" + "--skip=config_add_unsupported_type" + "--skip=config_add_unsupported_value" + "--skip=config_affected_when_deep_mutated" + "--skip=config_affected_when_mutated" + "--skip=config_is_mutable" + "--skip=config_preserved_after_do" + "--skip=fancy_default_errors" + "--skip=filesize_format_auto_metric_false" + "--skip=filesize_format_auto_metric_true" + "--skip=filesize_metric_false" + "--skip=filesize_metric_overrides_format" + "--skip=filesize_metric_true" + "--skip=narratable_errors" + "--skip=plugins") + #:cargo-inputs (("rust-byte-unit" ,rust-byte-unit-5) + ("rust-chrono" ,rust-chrono-0.4) + ("rust-chrono-humanize" ,rust-chrono-humanize-0.2) + ("rust-fancy-regex" ,rust-fancy-regex-0.13) + ("rust-indexmap" ,rust-indexmap-2) + ("rust-lru" ,rust-lru-0.12) + ("rust-miette" ,rust-miette-7) + ("rust-nu-path" ,rust-nu-path-0.91) + ("rust-nu-system" ,rust-nu-system-0.91) + ("rust-nu-utils" ,rust-nu-utils-0.91) + ("rust-num-format" ,rust-num-format-0.4) + ("rust-serde" ,rust-serde-1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-thiserror" ,rust-thiserror-1) + ("rust-typetag" ,rust-typetag-0.2)) + #:cargo-development-inputs + (("rust-nu-test-support" ,rust-nu-test-support-0.91) + ("rust-rstest" ,rust-rstest-0.18) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-strum" ,rust-strum-0.25) + ("rust-strum-macros" ,rust-strum-macros-0.26)))) + (home-page + "https://github.com/nushell/nushell/tree/main/crates/nu-protocol") + (synopsis "Nushell's internal protocols, including its abstract syntax tree") + (description + "This package provides nushell's internal protocols, including its abstract +syntax tree.") (license license:expat))) -(define-public rust-nu-serde-0.44 +(define-public rust-nu-std-0.91 (package - (name "rust-nu-serde") - (version "0.44.0") + (name "rust-nu-std") + (version "0.91.0") (source (origin (method url-fetch) - (uri (crate-uri "nu-serde" version)) + (uri (crate-uri "nu-std" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "190lid6jqgrb50qzqk849hg44rcn392qbppdm8zhgy732fsjb2j4")))) + (base32 "1igdid80qbfgqdmcg6szq2rsi7i5qlyhplw74byh81vkqsn5z74w")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-bigdecimal" ,rust-bigdecimal-0.3) - ("rust-insta" ,rust-insta-1) - ("rust-nu-protocol" ,rust-nu-protocol-0.44) - ("rust-nu-source" ,rust-nu-source-0.44) - ("rust-serde" ,rust-serde-1) - ("rust-thiserror" ,rust-thiserror-1)))) - (home-page "https://www.nushell.sh") - (synopsis "Turn any value into a @code{nu-protocol::Value} with Serde") - (description - "This crate turns any value into a @code{nu-protocol::Value} with -Serde.") + `(#:cargo-inputs (("rust-miette" ,rust-miette-7) + ("rust-nu-engine" ,rust-nu-engine-0.91) + ("rust-nu-parser" ,rust-nu-parser-0.91) + ("rust-nu-protocol" ,rust-nu-protocol-0.91)))) + (home-page "https://github.com/nushell/nushell/tree/main/crates/nu-std") + (synopsis "Standard library of Nushell") + (description "This package provides the standard library of Nushell.") (license license:expat))) -(define-public rust-nu-source-0.44 +(define-public rust-nu-system-0.91 (package - (name "rust-nu-source") - (version "0.44.0") + (name "rust-nu-system") + (version "0.91.0") (source (origin (method url-fetch) - (uri (crate-uri "nu-source" version)) + (uri (crate-uri "nu-system" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "04w4s4yk5byy5mmrhvcbcvf179vjmb9pa2jch5vgl6rckipzd31l")))) + (base32 "1jq87rjbmgpkf2cr2ajfs12f3wzpsh43m0drmrgj7b8lk2g6q9by")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-derive-new" ,rust-derive-new-0.5) - ("rust-getset" ,rust-getset-0.1) - ("rust-pretty" ,rust-pretty-0.5) - ("rust-serde" ,rust-serde-1) - ("rust-termcolor" ,rust-termcolor-1)))) - (home-page "https://www.nushell.sh") - (synopsis "Source string characterizer for Nushell") - (description - "This package provides a source string characterizer for -Nushell.") + `(#:cargo-inputs (("rust-chrono" ,rust-chrono-0.4) + ("rust-libc" ,rust-libc-0.2) + ("rust-libproc" ,rust-libproc-0.14) + ("rust-log" ,rust-log-0.4) + ("rust-mach2" ,rust-mach2-0.4) + ("rust-nix" ,rust-nix-0.27) + ("rust-ntapi" ,rust-ntapi-0.4) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-procfs" ,rust-procfs-0.16) + ("rust-sysinfo" ,rust-sysinfo-0.30) + ("rust-windows" ,rust-windows-0.52)))) + (home-page "https://github.com/nushell/nushell/tree/main/crates/nu-system") + (synopsis "Nushell system querying") + (description "Nushell system querying") (license license:expat))) -(define-public rust-nu-stream-0.44 +(define-public rust-nu-table-0.91 (package - (name "rust-nu-stream") - (version "0.44.0") + (name "rust-nu-table") + (version "0.91.0") (source (origin (method url-fetch) - (uri (crate-uri "nu-stream" version)) + (uri (crate-uri "nu-table" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "14fs2dqa4papd48zil35901z4sc0p15dga96jbrsbhimk85g0gba")))) + (base32 "0r3b0lvkmjfkkcpxq6pls0sc5jp08a25ykfi0hifn0lsb9nady9m")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-nu-errors" ,rust-nu-errors-0.44) - ("rust-nu-protocol" ,rust-nu-protocol-0.44) - ("rust-nu-source" ,rust-nu-source-0.44)))) - (home-page "https://www.nushell.sh") - (synopsis "Nushell stream") - (description "This package provides Nushell stream.") + `(#:cargo-inputs (("rust-fancy-regex" ,rust-fancy-regex-0.13) + ("rust-nu-ansi-term" ,rust-nu-ansi-term-0.50) + ("rust-nu-color-config" ,rust-nu-color-config-0.91) + ("rust-nu-engine" ,rust-nu-engine-0.91) + ("rust-nu-protocol" ,rust-nu-protocol-0.91) + ("rust-nu-utils" ,rust-nu-utils-0.91) + ("rust-once-cell" ,rust-once-cell-1) + ("rust-tabled" ,rust-tabled-0.14)))) + (home-page "https://github.com/nushell/nushell/tree/main/crates/nu-table") + (synopsis "Nushell table printing") + (description "This package provides nushell table printing.") (license license:expat))) -(define-public rust-nu-table-0.44 +(define-public rust-nu-term-grid-0.91 (package - (name "rust-nu-table") - (version "0.44.0") + (name "rust-nu-term-grid") + (version "0.91.0") (source (origin (method url-fetch) - (uri (crate-uri "nu-table" version)) + (uri (crate-uri "nu-term-grid" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0lk2cr8k0wbh5ya42ldz129yzfpqibzvjqy1bkpccfh2lf9n01g2")))) + (base32 "12f0i7m6flpkf1valkjfg6chalifpb65cknq91p22sii4dx0x89r")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-atty" ,rust-atty-0.2) - ("rust-nu-ansi-term" ,rust-nu-ansi-term-0.44) - ("rust-regex" ,rust-regex-1) - ("rust-strip-ansi-escapes" ,rust-strip-ansi-escapes-0.1) - ("rust-unicode-width" ,rust-unicode-width-0.1)))) - (home-page "https://www.nushell.sh") - (synopsis "Nushell table printing") - (description "Nushell table printing") + `(#:cargo-inputs (("rust-nu-utils" ,rust-nu-utils-0.91) + ("rust-unicode-width" ,rust-unicode-width-0.1)))) + (home-page + "https://github.com/nushell/nushell/tree/main/crates/nu-term-grid") + (synopsis "Nushell grid printing") + (description "This package provides nushell grid printing.") (license license:expat))) -(define-public rust-nu-test-support-0.44 +(define-public rust-nu-test-support-0.91 (package (name "rust-nu-test-support") - (version "0.44.0") + (version "0.91.0") (source (origin (method url-fetch) (uri (crate-uri "nu-test-support" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0fjaczf05lzs77f1chif11085xy2yklw2lzl0vz0sdzzkll1r374")))) + (base32 "146ncw3318hcbhb7cpz3bdz0ypd8x4cpzhhl0q55r2mxxci7ik38")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-bigdecimal" ,rust-bigdecimal-0.3) - ("rust-chrono" ,rust-chrono-0.4) - ("rust-getset" ,rust-getset-0.1) - ("rust-glob" ,rust-glob-0.3) - ("rust-hamcrest2" ,rust-hamcrest2-0.3) - ("rust-indexmap" ,rust-indexmap-1) - ("rust-nu-errors" ,rust-nu-errors-0.44) - ("rust-nu-path" ,rust-nu-path-0.44) - ("rust-nu-protocol" ,rust-nu-protocol-0.44) - ("rust-nu-source" ,rust-nu-source-0.44) - ("rust-num-bigint" ,rust-num-bigint-0.4) - ("rust-tempfile" ,rust-tempfile-3)))) - (home-page "https://www.nushell.sh") + `(#:cargo-test-flags + '("--release" "--" + ;; Not all files included. + "--skip=playground::tests::current_working_directory_back_to_root_from_anywhere" + "--skip=playground::tests::current_working_directory_in_sandbox_directory_created") + #:cargo-inputs (("rust-hamcrest2" ,rust-hamcrest2-0.3) + ("rust-nu-glob" ,rust-nu-glob-0.91) + ("rust-nu-path" ,rust-nu-path-0.91) + ("rust-nu-utils" ,rust-nu-utils-0.91) + ("rust-num-format" ,rust-num-format-0.4) + ("rust-tempfile" ,rust-tempfile-3) + ("rust-which" ,rust-which-6)))) + (home-page + "https://github.com/nushell/nushell/tree/main/crates/nu-test-support") (synopsis "Support for writing Nushell tests") - (description "This package provides support for writing Nushell -tests.") + (description "This package contains support for writing Nushell tests.") (license license:expat))) -(define-public rust-nu-value-ext-0.44 +(define-public rust-nu-utils-0.91 (package - (name "rust-nu-value-ext") - (version "0.44.0") + (name "rust-nu-utils") + (version "0.91.0") (source (origin (method url-fetch) - (uri (crate-uri "nu-value-ext" version)) - (file-name - (string-append name "-" version ".tar.gz")) + (uri (crate-uri "nu-utils" version)) + (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "0ag5y6qfj53w6skyb0vhwhxiykvpmz5izpgxnbz5r0i0bdscrmdy")))) + (base32 "0xlnhli0zmv4nxznmjb2azq62ywq252zqvpx4668xv70japd74ag")))) (build-system cargo-build-system) (arguments - `(#:skip-build? #t - #:cargo-inputs - (("rust-indexmap" ,rust-indexmap-1) - ("rust-itertools" ,rust-itertools-0.10) - ("rust-nu-errors" ,rust-nu-errors-0.44) - ("rust-nu-protocol" ,rust-nu-protocol-0.44) - ("rust-nu-source" ,rust-nu-source-0.44) - ("rust-num-traits" ,rust-num-traits-0.2)))) - (home-page "https://www.nushell.sh") - (synopsis "@code{Extension} traits for values in Nushell") - (description - "This package provides @code{Extension} traits for values in -Nushell.") + `(#:cargo-inputs (("rust-crossterm-winapi" ,rust-crossterm-winapi-0.9) + ("rust-log" ,rust-log-0.4) + ("rust-lscolors" ,rust-lscolors-0.17) + ("rust-num-format" ,rust-num-format-0.4) + ("rust-strip-ansi-escapes" ,rust-strip-ansi-escapes-0.2) + ("rust-sys-locale" ,rust-sys-locale-0.3) + ("rust-unicase" ,rust-unicase-2)))) + (home-page "https://github.com/nushell/nushell/tree/main/crates/nu-utils") + (synopsis "Nushell utility functions") + (description "This package contains utility functions for nushell.") (license license:expat))) + diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm index 4fa2e93d81..824318bf51 100644 --- a/gnu/packages/simulation.scm +++ b/gnu/packages/simulation.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2022 Liliana Marie Prikler <liliana.prikler@gmail.com> ;;; Copyright © 2023 Reza Housseini <reza@housseini.me> ;;; Copyright © 2024 Ricardo Wurmus <rekado@elephly.net> +;;; Copyright © 2024 Sharlatan Hellseher <sharlatanus@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -1180,30 +1181,68 @@ command-line utility for mesh optimisation.") (name "python-dolfin-adjoint") (version "2019.1.0") (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/dolfin-adjoint/pyadjoint") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0xhy76a5f33hz94wc9g2mc5qmwkxfccbbc6yxl7psm130afp8lhn")) - (modules '((guix build utils))) - (snippet - '(begin - ;; One of the migration tests attempts to call openmpi - ;; recursively and fails. See - ;; https://bitbucket.org/mpi4py/mpi4py/issues/95. Run the - ;; test sequentially instead. - (with-directory-excursion "tests/migration/optimal_control_mms" - (substitute* "test_optimal_control_mms.py" - (("\\\"mpirun\\\", \\\"-n\\\", \\\"2\\\", ") ""))) - ;; Result files are regenerated in the check phase. - (delete-file-recursively - "tests/migration/viscoelasticity/test-results") - #t)))) - (build-system python-build-system) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/dolfin-adjoint/pyadjoint") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0xhy76a5f33hz94wc9g2mc5qmwkxfccbbc6yxl7psm130afp8lhn")) + (modules '((guix build utils))) + (snippet + '(begin + ;; One of the migration tests attempts to call openmpi + ;; recursively and fails. See + ;; https://bitbucket.org/mpi4py/mpi4py/issues/95. Run the + ;; test sequentially instead. + (with-directory-excursion "tests/migration/optimal_control_mms" + (substitute* "test_optimal_control_mms.py" + (("\\\"mpirun\\\", \\\"-n\\\", \\\"2\\\", ") ""))) + ;; Result files are regenerated in the check phase. + (delete-file-recursively + "tests/migration/viscoelasticity/test-results"))))) + (build-system pyproject-build-system) + (arguments + (list + #:test-flags + #~(list + ;; Ignore tests which require missing packages and/or failed during + ;; tests collection. + "--ignore=tests/firedrake_adjoint/test_assignment.py" + "--ignore=tests/firedrake_adjoint/test_burgers_newton.py" + "--ignore=tests/firedrake_adjoint/test_dynamic_meshes.py" + "--ignore=tests/firedrake_adjoint/test_hessian.py" + "--ignore=tests/firedrake_adjoint/test_reduced_functional.py" + "--ignore=tests/firedrake_adjoint/test_shape_derivatives.py" + "--ignore=tests/firedrake_adjoint/test_solving.py" + "--ignore=tests/firedrake_adjoint/test_tlm.py" + "--ignore=tests/migration/burgers_newton/test_burgers_newton.py" + "--ignore=tests/migration/linear_solver/test_linear_solver.py" + "--ignore=tests/migration/optimization_scipy/test_optimization_scipy.py" + "--ignore=tests/migration/projection/test_projection.py" + "--ignore=tests/migration/reduced_functional/test_reduced_functional.py" + "--ignore=tests/migration/split/test_split.py" + "-k" (string-append "not test_read_checkpoint" + " and not test_krylov_solver_preconditioner_function_ctrl")) + #:phases + #~(modify-phases %standard-phases + (add-after 'build 'mpi-setup #$%openmpi-setup) + (add-before 'check 'set-environment-variables + (lambda _ + (setenv "HOME" (getcwd)))) + (add-after 'install 'install-doc + (lambda _ + (let* ((doc (string-append #$output "/share/doc/" #$name "-" #$version)) + (examples (string-append doc "/examples"))) + (mkdir-p examples) + (copy-recursively "examples" examples)))) + ;; Remove 'sanity-check, because it tries to import + ;; firedrake_adjoint after importing fenics_adjoint. + ;; Both load a module named 'backend' and firedrake_adjoint + ;; fails with an ImportError if it sees that the backend module + ;; has already been loaded. + (delete 'sanity-check)))) (inputs (list fenics openmpi pybind11)) (native-inputs @@ -1214,48 +1253,18 @@ command-line utility for mesh optimisation.") python-pkgconfig python-pytest)) (propagated-inputs - `(("scipy" ,python-scipy))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'build 'mpi-setup - ,%openmpi-setup) - (add-after 'install 'install-doc - (lambda* (#:key outputs #:allow-other-keys) - (let* ((doc (string-append (assoc-ref outputs "out") - "/share/doc/" ,name "-" - ,version)) - (examples (string-append doc "/examples"))) - (mkdir-p examples) - (copy-recursively "examples" examples)) - #t)) - (replace 'check - (lambda* (#:key inputs outputs tests? #:allow-other-keys) - (when tests? - (add-installed-pythonpath inputs outputs) - (setenv "HOME" (getcwd)) - (and (invoke "py.test" "-v" "tests/fenics_adjoint" - "-k" "not test_read_checkpoint") - (invoke "py.test" "-v" "tests/migration") - (invoke "py.test" "-v" "tests/pyadjoint"))) - #t)) - ;; Remove 'sanity-check, because it tries to import - ;; firedrake_adjoint after importing fenics_adjoint. - ;; Both load a module named 'backend' and firedrake_adjoint - ;; fails with an ImportError if it sees that the backend module - ;; has already been loaded. - (delete 'sanity-check)))) + (list python-scipy)) (home-page "https://www.dolfin-adjoint.org") (synopsis "Automatic differentiation library") - (description "@code{python-dolfin-adjoint} is a solver of -differential equations associated with a governing system and a -functional of interest. Working from the forward model the solver -automatically derives the discrete adjoint and tangent linear models. -These additional models are key ingredients in many algorithms such as -data assimilation, optimal control, sensitivity analysis, design -optimisation and error estimation. The dolfin-adjoint project -provides the necessary tools and data structures for cases where the -forward model is implemented in @code{fenics} or + (description + "@code{python-dolfin-adjoint} is a solver of differential equations +associated with a governing system and a functional of interest. Working from +the forward model the solver automatically derives the discrete adjoint and +tangent linear models. These additional models are key ingredients in many +algorithms such as data assimilation, optimal control, sensitivity analysis, +design optimisation and error estimation. The dolfin-adjoint project provides +the necessary tools and data structures for cases where the forward model is +implemented in @code{fenics} or @url{https://firedrakeproject.org,firedrake}.") (license license:lgpl3))) diff --git a/gnu/packages/spreadsheet.scm b/gnu/packages/spreadsheet.scm index 363d0ae16f..3ccd922747 100644 --- a/gnu/packages/spreadsheet.scm +++ b/gnu/packages/spreadsheet.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2020, 2021 Ryan Prior <rprior@protonmail.com> ;;; Copyright © 2020 Ekaitz Zarraga <ekaitz@elenq.tech> -;;; Copyright © 2021, 2023 jgart <jgart@dismail.de> +;;; Copyright © 2021, 2023-2024 jgart <jgart@dismail.de> ;;; ;;; This file is part of GNU Guix. ;;; @@ -99,24 +99,24 @@ (define-public visidata (package (name "visidata") - (version "2.8") + (version "3.0.2") (source (origin (method url-fetch) (uri (pypi-uri "visidata" version)) (sha256 (base32 - "1jfhrk0xvzzqfzs0khbig2dc94718qki8zys1f1a9553vjncvmi6")))) + "0nn0fwm0172gn5ffil310k7hmxqrrc1dn6xfz7jxsj0vikq8vhrq")))) (build-system python-build-system) (arguments - '(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? (invoke "pytest")) - #t))))) + (list #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? (invoke "pytest"))))))) (inputs (list python-dateutil + python-importlib-metadata python-requests python-lxml python-openpyxl diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 9dee863c55..1dd7cad2d9 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -20,6 +20,7 @@ ;;; Copyright © 2023 gemmaro <gemmaro.dev@gmail.com> ;;; Copyright © 2023 Felix Gruber <felgru@posteo.net> ;;; Copyright © 2023 Troy Figiel <troy@troyfigiel.com> +;;; Copyright © 2024 Vinicius Monego <monego@posteo.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -227,7 +228,7 @@ This package also provides @command{xls2csv} to export Excel files to CSV.") (define r-with-tests (package (name "r-with-tests") - (version "4.4.0") + (version "4.4.1") (source (origin (method url-fetch) (uri (string-append "mirror://cran/src/base/R-" @@ -235,7 +236,7 @@ This package also provides @command{xls2csv} to export Excel files to CSV.") version ".tar.gz")) (sha256 (base32 - "0c7hnmr0w26vpaf8b10m83f4w3g3fl6a7z65pi9jqvcpkdgi5r5c")))) + "0kfrn8v8l555n5xrpf753jar5wa3vs622p967ffjkdxfx9fngjxl")))) (build-system gnu-build-system) (arguments (list @@ -539,14 +540,14 @@ D.V. Hinkley (1997, CUP), originally written by Angelo Canty for S.") (define-public r-mass (package (name "r-mass") - (version "7.3-60.2") + (version "7.3-61") (source (origin (method url-fetch) (uri (cran-uri "MASS" version)) (sha256 (base32 - "13ky8mbni09zviv5lan10ff6l2klsfv7v3vmfq88dxpz8xknx75v")))) + "140ah1719zad8gd0glvy9qlkxxakgz12i5r5gk2bgmwxayzwhi1i")))) (properties `((upstream-name . "MASS"))) (build-system r-build-system) (home-page "https://www.stats.ox.ac.uk/pub/MASS4/") @@ -623,14 +624,14 @@ code for possible problems.") (define-public r-foreign (package (name "r-foreign") - (version "0.8-86") + (version "0.8-87") (source (origin (method url-fetch) (uri (cran-uri "foreign" version)) (sha256 (base32 - "1qf3x1vacc4sdcmw4mbh0251ii4xd8z1xmmd9isak75j100i4ad7")))) + "0mi8vf3bsvrn2nh9kxjlgsmvxrc8icw51scr0mscqyp8r3saq90s")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/foreign") (synopsis "Read data stored by other statistics software") @@ -643,14 +644,14 @@ for reading and writing some dBase files.") (define-public r-kernsmooth (package (name "r-kernsmooth") - (version "2.23-22") + (version "2.23-24") (source (origin (method url-fetch) (uri (cran-uri "KernSmooth" version)) (sha256 (base32 - "1sblhl7b9d3m6034xd3254ddkj9ssqxawknzksfbgjh68s849q3n")))) + "0pxc53sw9f4hhxnl3zkalkkk0fvzcfxw7c4ibrb95zbzahwyrcyh")))) (properties `((upstream-name . "KernSmooth"))) (build-system r-build-system) (native-inputs @@ -709,13 +710,13 @@ and operations on them using LAPACK and SuiteSparse.") (define-public r-nlme (package (name "r-nlme") - (version "3.1-164") + (version "3.1-165") (source (origin (method url-fetch) (uri (cran-uri "nlme" version)) (sha256 - (base32 "1s6lpp4hpjhyn7ygfngw2f60a40kbbikd0y2wqzbhdvhrqha19br")))) + (base32 "16clxh0b8sr2k3vddfip3awimn17ffkd5kwgygi8n4y2jfjbndzw")))) (build-system r-build-system) (propagated-inputs (list r-lattice)) @@ -811,14 +812,14 @@ analysis.") (define-public r-survival (package (name "r-survival") - (version "3.6-4") + (version "3.7-0") (source (origin (method url-fetch) (uri (cran-uri "survival" version)) (sha256 (base32 - "1zpfqslpzck10pmaiyc8x7852ajbjd0l6aw18hwfrm418wjamy1f")))) + "1vzy8kg159yqnvg733air11la2qrirwcqhn9d67h5c18r67b15nd")))) (build-system r-build-system) (propagated-inputs (list r-matrix)) @@ -976,13 +977,13 @@ effects of different types of color-blindness.") (define-public r-digest (package (name "r-digest") - (version "0.6.35") + (version "0.6.36") (source (origin (method url-fetch) (uri (cran-uri "digest" version)) (sha256 - (base32 "07vqv2mnf8ppan2a3gydh4yr84n8489hypfas1rlk7050nxkycyc")))) + (base32 "0dz6gbfd9qnhn1jjfc4ni3w440183dygla4lszwkz2rmn9j76xyi")))) (build-system r-build-system) ;; Vignettes require r-knitr, which requires r-digest, so we have to ;; disable them and the tests. @@ -1424,13 +1425,13 @@ evaluation (NSE) in R.") (define-public r-dbi (package (name "r-dbi") - (version "1.2.2") + (version "1.2.3") (source (origin (method url-fetch) (uri (cran-uri "DBI" version)) (sha256 (base32 - "10d7sl9nk1gkkbinmvplyp2hg9zgxgs03llamrvbf4a5cnrs0mcd")))) + "1gid1mfzq1j3n5fsnpzdb50p2m73z92s6njp0sgr503aaskhhryg")))) (build-system r-build-system) (native-inputs (list r-knitr)) @@ -1464,13 +1465,13 @@ for template use among CRAN packages.") (define-public r-evaluate (package (name "r-evaluate") - (version "0.23") + (version "0.24.0") (source (origin (method url-fetch) (uri (cran-uri "evaluate" version)) (sha256 (base32 - "0p540jl6sixpgk08cp2h9470d28p7n66pfafiskvz3rba0vrrky9")))) + "1mkzb2f8rv0qd33h3gqq7idkpxnnx7zcr93xsmbm4lp7b157cgg2")))) (build-system r-build-system) (home-page "https://github.com/hadley/evaluate") (synopsis "Parsing and evaluation tools for R") @@ -1506,13 +1507,13 @@ There is also a Shiny app as a user interface in this package.") (define-public r-highr (package (name "r-highr") - (version "0.10") + (version "0.11") (source (origin (method url-fetch) (uri (cran-uri "highr" version)) (sha256 (base32 - "0yrlpjs8qzq1d7iy4gypnf4x1gvxq6vaghkdh1kfv433yqgvqmgc")))) + "19z0gwdy46z6gb46b3fs2ljxa2cn0bpvx7aam0jk75h180l183g9")))) (build-system r-build-system) (propagated-inputs (list r-xfun)) @@ -1580,13 +1581,13 @@ data derived from /etc/mime.types in UNIX-type systems.") (define-public r-markdown (package (name "r-markdown") - (version "1.12") + (version "1.13") (source (origin (method url-fetch) (uri (cran-uri "markdown" version)) (sha256 (base32 - "182b290dj0c6m4qf4azyih521ski0ssk1awzmbzfbqlcy3lf7p3x")))) + "1nfgngskgb4r34r3cnkm0gn7p1axpcb7rpyi0jxg4nygfk322m1q")))) (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 @@ -1624,13 +1625,13 @@ emitter (http://pyyaml.org/wiki/LibYAML) for R.") (define-public r-knitr (package (name "r-knitr") - (version "1.46") + (version "1.47") (source (origin (method url-fetch) (uri (cran-uri "knitr" version)) (sha256 (base32 - "0ng8kw79csvcg46lsm3yf147jh6rf91jbj8qlryaihd8jcyc6lcg")))) + "1kx6g8ddbigwx3bmq771gwi3din3fxjn59l801904kjaz6dq9pgs")))) (build-system r-build-system) (propagated-inputs (list r-evaluate r-highr r-xfun r-yaml)) @@ -1728,13 +1729,13 @@ you call it again with the same arguments it returns the pre-computed value.") (define-public r-crayon (package (name "r-crayon") - (version "1.5.2") + (version "1.5.3") (source (origin (method url-fetch) (uri (cran-uri "crayon" version)) (sha256 (base32 - "0yjsnhifr3nipaid0q11jjglvqmp51g9d2xdh9kfxh5knl2sbabh")))) + "0sfsx4k77fsx1dx9c186dg273psrr3awz4ivfvmbbvs1amla0x1y")))) (build-system r-build-system) (home-page "https://github.com/gaborcsardi/crayon") (synopsis "Colored terminal output for R") @@ -1828,13 +1829,13 @@ defined in different packages.") (define-public r-rlang (package (name "r-rlang") - (version "1.1.3") + (version "1.1.4") (source (origin (method url-fetch) (uri (cran-uri "rlang" version)) (sha256 (base32 - "02mz53g8lk26yi0js6qq57ijhl1mw7xm82vwbwzbvi62bm5l58r4")))) + "1qd6chyciwhj6f6w56d3pcy4q8qdvqkyn2s709qjiwwba0klbmzj")))) (build-system r-build-system) (home-page "http://rlang.tidyverse.org") (synopsis "Functions for base types, core R and Tidyverse features") @@ -1998,14 +1999,14 @@ side.") (define-public r-locfit (package (name "r-locfit") - (version "1.5-9.9") + (version "1.5-9.10") (source (origin (method url-fetch) (uri (cran-uri "locfit" version)) (sha256 (base32 - "1m7ji1ykvffqvs9ly1pzadiwhwxcyv4xivziikmahp0w0sv45lck")))) + "01mcfsqqqwdf9iggabyckid7rf5c9f0v0hjz8g58fflr2hc6c82c")))) (build-system r-build-system) (propagated-inputs (list r-lattice)) @@ -2180,7 +2181,7 @@ machine learning, computer vision, and high-dimensional statistics.") (define-public python-arviz (package (name "python-arviz") - (version "0.17.1") + (version "0.18.0") (source (origin (method git-fetch) ; PyPI misses some test files (uri (git-reference @@ -2189,7 +2190,7 @@ machine learning, computer vision, and high-dimensional statistics.") (file-name (git-file-name name version)) (sha256 (base32 - "1rpm2a9swzhnqn84dfsbc8kvz6qnn8w2icr3p08gwax9h9pg4ksp")))) + "1bdj2mm8zdd83ln9ka9p6bln3n5kkpfmrhgqyy018h51l156m529")))) (build-system pyproject-build-system) (arguments ;; FIXME: matplotlib tests fail because of the "--save" test flag. @@ -2208,7 +2209,8 @@ machine learning, computer vision, and high-dimensional statistics.") ;; 3 tests require write permission. (setenv "HOME" "/tmp")))))) (native-inputs (list python-cloudpickle python-pytest)) - (propagated-inputs (list python-h5netcdf + (propagated-inputs (list python-dm-tree + python-h5netcdf python-matplotlib python-numpy python-packaging @@ -2416,13 +2418,13 @@ conformal prediction methods intervals.") (define-public python-emcee (package (name "python-emcee") - (version "3.1.4") + (version "3.1.6") (source (origin (method url-fetch) (uri (pypi-uri "emcee" version)) (sha256 - (base32 "1vbz67cwzig28dlndkm6g246p1vcvj6yy2w65z8cdyffigf1j3lf")))) + (base32 "0zb3ihja3hyj6zjbhkpxhyyppnv58q2jjg0yd1lwmydqdaplvbqi")))) (build-system pyproject-build-system) (propagated-inputs (list python-numpy)) (native-inputs (list python-coverage @@ -2714,14 +2716,14 @@ limited to R.") (define-public r-backports (package (name "r-backports") - (version "1.4.1") + (version "1.5.0") (source (origin (method url-fetch) (uri (cran-uri "backports" version)) (sha256 (base32 - "0x144hij0rzhrxdq3k5ph8fk7pdgl1avjca25j4mlpmhzdckqp44")))) + "18kwi50bvha6p5jfl833grmhqzi55adnd3glcy4yh18mizdxjghd")))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/backports") (synopsis "Reimplementations of functions introduced since R 3.0.0") @@ -2900,13 +2902,13 @@ tables, autolinks and strikethrough text.") (define-public r-roxygen2 (package (name "r-roxygen2") - (version "7.3.1") + (version "7.3.2") (source (origin (method url-fetch) (uri (cran-uri "roxygen2" version)) (sha256 (base32 - "1j72arkadw93f4wrzxhryn3666jwnablr1bhk0zv6g77q2lrypi1")))) + "0701v8dglv0mdsjs1mijpylpciiijb2schplavkf5drjj6gqg25p")))) (build-system r-build-system) (propagated-inputs (list r-brew @@ -2935,14 +2937,14 @@ collation, and NAMESPACE files.") (define-public r-openssl (package (name "r-openssl") - (version "2.1.2") + (version "2.2.0") (source (origin (method url-fetch) (uri (cran-uri "openssl" version)) (sha256 (base32 - "0mm0rlf3m6wkvz5p8prxwjr37rn30lmhddsdi4ffnsmrysfl3rbp")))) + "1cyx2yv2l446xwf0a0im70zfd6jlpg8113ncgdydajyvx1mb9f0q")))) (properties `((upstream-name . "openssl") (updater-extra-inputs . ("openssl")))) @@ -3225,13 +3227,13 @@ well as additional utilities such as panel and axis annotation functions.") (define-public r-rcpparmadillo (package (name "r-rcpparmadillo") - (version "0.12.8.3.0") + (version "0.12.8.4.0") (source (origin (method url-fetch) (uri (cran-uri "RcppArmadillo" version)) (sha256 (base32 - "02sj42apznls45sapiisaggfijdvg69a2ja2mz4fraqaajrkkwc7")))) + "0iihy2pbmc56s5s6x7ac1c1biqda60gyqkddvn2c211j0xjnigya")))) (properties `((upstream-name . "RcppArmadillo"))) (build-system r-build-system) (propagated-inputs @@ -3317,13 +3319,13 @@ certain criterion, e.g., it contains a certain regular file.") (define-public r-rmarkdown (package (name "r-rmarkdown") - (version "2.26") + (version "2.27") (source (origin (method url-fetch) (uri (cran-uri "rmarkdown" version)) (sha256 - (base32 "1q6z2j1y6pjdz4nzw44srv9j62irnxqhkvrsi46ma7xrzq6ig34g")))) + (base32 "17rba2k1n945i56am345v9zfgdwm4rjmhcwdm7z8g1agmczcpsb1")))) (properties `((upstream-name . "rmarkdown") (updater-extra-propagated-inputs . ("pandoc")))) @@ -3438,13 +3440,13 @@ a column in data frame.") (define-public r-rsqlite (package (name "r-rsqlite") - (version "2.3.6") + (version "2.3.7") (source (origin (method url-fetch) (uri (cran-uri "RSQLite" version)) (sha256 (base32 - "1wpqr71wckxrh8ih5f01wkqqqnq5s3zaj0m8b40g76pliyjvgcgv")))) + "1kllna6hfnyy3rizr8wkpfn7p5sxv3sra12x9vz68hp6i4jmgq15")))) (properties `((upstream-name . "RSQLite"))) (build-system r-build-system) (propagated-inputs @@ -3509,13 +3511,13 @@ ldap, and also supports cookies, redirects, authentication, etc.") (define-public r-xml (package (name "r-xml") - (version "3.99-0.16.1") + (version "3.99-0.17") (source (origin (method url-fetch) (uri (cran-uri "XML" version)) (sha256 (base32 - "1i7fs9i2f6bdkxb45w2bck7sshlwxy2s32hi9fwa4nfmw2iy62m3")))) + "1n52k06jrgyjmz96mv4sv6kczqkhmz2spr3gymcjzzv9zxjk48vf")))) (properties `((upstream-name . "XML"))) (build-system r-build-system) @@ -3630,14 +3632,14 @@ statements.") (define-public r-segmented (package (name "r-segmented") - (version "2.0-4") + (version "2.1-0") (source (origin (method url-fetch) (uri (cran-uri "segmented" version)) (sha256 (base32 - "0a7qfs83kgn7g98kiwlk8zm2q9pzgkvmms9l15sgc5y952yig926")))) + "1whcch1lw9y5fgy205377hr69xdjmav57z63vzgj7ammihja0yvd")))) (build-system r-build-system) (propagated-inputs (list r-mass r-nlme)) (home-page "https://cran.r-project.org/web/packages/segmented") @@ -3672,17 +3674,17 @@ worker processes and collect and return the results on the master.") (define-public r-sparsem (package (name "r-sparsem") - (version "1.81") + (version "1.84") (source (origin (method url-fetch) (uri (cran-uri "SparseM" version)) (sha256 (base32 - "0csbqd9wm6r4162mday1iaigzf9wv2rp1zq8hnihys6f38w8z0xx")))) + "05pxj16l1d9smlsn9h3pxcnd49s8l7f6088xvn808pa1f3h9dybn")))) (properties `((upstream-name . "SparseM"))) (native-inputs - (list gfortran)) + (list gfortran r-knitr)) (build-system r-build-system) (home-page "http://www.econ.uiuc.edu/~roger/research/sparse/sparse.html") (synopsis "Sparse linear algebra") @@ -4478,13 +4480,13 @@ vignettes.") (define-public r-mvtnorm (package (name "r-mvtnorm") - (version "1.2-4") + (version "1.2-5") (source (origin (method url-fetch) (uri (cran-uri "mvtnorm" version)) (sha256 (base32 - "1zws7myh61622v46gir6bs0dpyp6siz0hx7lrsvymshn02xqg0l4")))) + "19pdwdkhc7bv6r9xkzpxmpgmz7mvsrzxfvj6jy02hpjdlaiq4y4y")))) (build-system r-build-system) (native-inputs (list gfortran)) @@ -4811,14 +4813,14 @@ data behind them) can be viewed and modified in a web browser.") (define-public r-biased-urn (package (name "r-biased-urn") - (version "2.0.11") + (version "2.0.12") (source (origin (method url-fetch) (uri (cran-uri "BiasedUrn" version)) (sha256 (base32 - "0dvmkrdmhfh4swilyxf10y856kx0zf9sj1gc0g62bm6r5jhz35b2")))) + "14jpijms81pgl4zyqrhwwdfj0jmlmml21blspvin8lqw8fbbbcr9")))) (properties `((upstream-name . "BiasedUrn"))) (build-system r-build-system) (home-page "https://www.agner.org/random/") @@ -4998,13 +5000,13 @@ package instead.") (define-public r-hmisc (package (name "r-hmisc") - (version "5.1-2") + (version "5.1-3") (source (origin (method url-fetch) (uri (cran-uri "Hmisc" version)) (sha256 - (base32 "088gniwbymzhqg3vp0kpkbazryjzy9iq6wdvf9hg9qf0sjbibpg7")))) + (base32 "1sq5qvlr9swhdvf3l420y9fxq5s1qw8aiyl9a62sb357ywppfq9w")))) (properties `((upstream-name . "Hmisc"))) (build-system r-build-system) (native-inputs @@ -5733,14 +5735,14 @@ can be efficiently implemented directly in the R language.") (define-public r-robustbase (package (name "r-robustbase") - (version "0.99-2") + (version "0.99-3") (source (origin (method url-fetch) (uri (cran-uri "robustbase" version)) (sha256 (base32 - "0i6dzri3bfkpmp7h0h5nyzigs9rjzdd3c4ilapmvadmfywl9d9mn")))) + "11h0v9q44i8gl55q40aszmzn7214pljpzncgcws9pvgbypf17g31")))) (build-system r-build-system) (native-inputs (list gfortran)) @@ -5906,13 +5908,13 @@ groupings.") (define-public r-vgam (package (name "r-vgam") - (version "1.1-10") + (version "1.1-11") (source (origin (method url-fetch) (uri (cran-uri "VGAM" version)) (sha256 - (base32 "04yy5rxid3fwn42sak9rjbxd1h4d7iigiznpbrvwxl06b1xficyb")))) + (base32 "199kicvlxciff9x243h357n4bjl00yg9k5jgs9awzz5wsadr17fy")))) (properties `((upstream-name . "VGAM"))) (build-system r-build-system) (native-inputs @@ -5950,14 +5952,14 @@ showing the progress is useful e.g. bootstrap.") (define-public r-minqa (package (name "r-minqa") - (version "1.2.6") + (version "1.2.7") (source (origin (method url-fetch) (uri (cran-uri "minqa" version)) (sha256 (base32 - "0421b4ysslaqmdgwlz080abis8m4xkcvjq7lx1wywbsz1s2vi9si")))) + "1qigwpcj8mz1fgq4ikq64pkqfwgw50bd928xbc4xaq6q3sflbwvn")))) (build-system r-build-system) (propagated-inputs (list r-rcpp)) @@ -6041,13 +6043,13 @@ using modular prediction and response module classes.") (define-public r-quantreg (package (name "r-quantreg") - (version "5.97") + (version "5.98") (source (origin (method url-fetch) (uri (cran-uri "quantreg" version)) (sha256 - (base32 "18bdcxm2f8gc2bxdxrk80dcafl8d5snckp0913pkdsfyfrbxxrw7")))) + (base32 "0qbad2wzw7qvsrm821k2vr0dsx75jj3qbs2sl9k3ymngv1cv5359")))) (build-system r-build-system) (arguments (list @@ -6073,21 +6075,18 @@ expected shortfall risk are also included.") (define-public r-nloptr (package (name "r-nloptr") - (version "2.0.3") + (version "2.1.1") (source (origin (method url-fetch) (uri (cran-uri "nloptr" version)) (sha256 (base32 - "1mqnjswm0dl6vqc8b2s5k3n1mhanaha3l33vh68dh6zx8q9aq9kv")))) + "1snqvav2pxjhssn1nld49mjj89cn2zv7gjn2y8ch22gbzmfzbnjc")))) (build-system r-build-system) (native-inputs - (list r-knitr ; for building vignettes - pkg-config gfortran)) - (inputs - (list nlopt)) - (propagated-inputs (list r-testthat)) + (list gfortran pkg-config r-knitr)) + (inputs (list nlopt)) (home-page "https://cran.r-project.org/web/packages/nloptr") (synopsis "R interface to NLopt") (description @@ -6101,14 +6100,14 @@ algorithms.") (define-public r-lme4 (package (name "r-lme4") - (version "1.1-35.3") + (version "1.1-35.4") (source (origin (method url-fetch) (uri (cran-uri "lme4" version)) (sha256 (base32 - "0ij37wly0d28x143xdkjry5jsj4chlbli2fl9zbp8fkcgh95r1xl")))) + "1zwr0wyrxllysbm2ca7hawzh4kmyxk23hkvszvzddjgi7wkw76jq")))) (build-system r-build-system) (propagated-inputs (list r-boot @@ -6134,17 +6133,18 @@ C++ library for numerical linear algebra and RcppEigen glue.") (define-public r-pbkrtest (package (name "r-pbkrtest") - (version "0.5.2") + (version "0.5.3") (source (origin (method url-fetch) (uri (cran-uri "pbkrtest" version)) (sha256 (base32 - "1qxnd4pfpsq762x81s3vkw09wdwpfj25bba5474g7z506pqasycf")))) + "0qxswrk54r40qmi9ky7jzv53mrlr2w2mrlf1czma597nzrb52gmh")))) (build-system r-build-system) (propagated-inputs (list r-broom + r-doby r-dplyr r-lme4 r-mass @@ -7095,18 +7095,18 @@ mediation and estimating power.") (define-public r-clubsandwich (package (name "r-clubsandwich") - (version "0.5.10") + (version "0.5.11") (source (origin (method url-fetch) (uri (cran-uri "clubSandwich" version)) (sha256 (base32 - "0qx4qq0k01q06hrs348n417pf338dyfbcy2vsi0y3ap6y1rb7w6s")))) + "1y9iy86w2440y22279is7vgi9m9v876p5954nhq5lg9ghpzbwzdq")))) (properties `((upstream-name . "clubSandwich"))) (build-system r-build-system) (propagated-inputs - (list r-sandwich)) + (list r-lifecycle r-sandwich)) (native-inputs (list r-knitr)) (home-page "https://github.com/jepusto/clubSandwich") (synopsis "Cluster-Robust (Sandwich) Variance Estimators with Small-Sample @@ -7802,13 +7802,13 @@ Neyman, 1936; cf. Spiller et al., 2012), etc.") (define-public r-mumin (package (name "r-mumin") - (version "1.47.5") + (version "1.48.4") (source (origin (method url-fetch) (uri (cran-uri "MuMIn" version)) (sha256 (base32 - "0xqasb79lmdhff25zalzrpjwv6qs9qnxr54ypnqjjgshi96mbwvg")))) + "04zn63snv218c44nllfh8bqh5xg0gamd9fcpwxisvi9gwb3f20i0")))) (properties `((upstream-name . "MuMIn"))) (build-system r-build-system) (propagated-inputs (list r-insight r-matrix r-nlme)) diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index e2d67b0600..af736d0c28 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -190,12 +190,12 @@ dbus desktop-file-utils glib - karchive - kconfig - kcoreaddons - kio + karchive-5 + kconfig-5 + kcoreaddons-5 + kio-5 kjs - kwidgetsaddons + kwidgetsaddons-5 libcloudproviders libzip openssl diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index ea8249869d..47cbb7ee74 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -66,7 +66,6 @@ (list #:modules '((srfi srfi-26) ; for cut (guix build utils) (guix build go-build-system)) - #:go go-1.20 #:import-path "github.com/syncthing/syncthing" ;; We don't need to install the source code for end-user applications. #:install-source? #f diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm index 18d3df5b6e..f7a6cea697 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-2023 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2016, 2017, 2019-2024 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2018, 2019, 2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2020, 2023 Vinicius Monego <monego@posteo.net> ;;; Copyright © 2021 Felix Gruber <felgru@posteo.net> @@ -224,14 +224,14 @@ cards.") (define-public newsboat (package (name "newsboat") - (version "2.34") + (version "2.35") (source (origin (method url-fetch) (uri (string-append "https://newsboat.org/releases/" version "/newsboat-" version ".tar.xz")) (sha256 - (base32 "0kj3qbm3881fkrplvgnng4747bh29a8f2hhm7a2gc1n9n0wvbmvk")))) + (base32 "1i5nil0lwa621ixxp1vwkic56sxsqp46pyq1xw7lrr1qrbv07w7l")))) (build-system cargo-build-system) (native-inputs `(("gettext" ,gettext-minimal) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 358374a5bb..a77164b93e 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -505,8 +505,8 @@ Telegram project, for its use in telegram desktop client.") hime hunspell jemalloc - kcoreaddons - kimageformats + kcoreaddons-5 + kimageformats-5 libdispatch libexpected libjpeg-turbo diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index b6eb48785d..ecccf039f7 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -626,13 +626,13 @@ OpenBSD team.") (define-public nano (package (name "nano") - (version "8.0") + (version "8.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/nano/nano-" version ".tar.xz")) (sha256 - (base32 "1i4ski9l06w3ra4z1nf2ml4bignm073hk8jhxqrnncrp1vy46zy1")))) + (base32 "1jz8rgqd0r1gn9vk1fim51h2kb0f72mvg76gkkz8kqss2ply7cwk")))) (build-system gnu-build-system) (inputs (list gettext-minimal ncurses)) diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index 0d704faed9..7deea364d8 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -1428,7 +1428,9 @@ of a Unix terminal to HTML code.") (define-public vale (package (name "vale") - (version "2.4.0") + ;; Newer versions requires <github.com/smacker/go-tree-sitter> which is + ;; quite a large project to pack. + (version "3.4.2") (source (origin (method git-fetch) @@ -1436,43 +1438,93 @@ of a Unix terminal to HTML code.") (url "https://github.com/errata-ai/vale") (commit (string-append "v" version)))) (sha256 - (base32 "0d07fwha2220m8j24h527xl0gnl3svvyaywflgk5292d6g49ach2")) + (base32 "15f8ggh7hpfmfpszl9qkdfz19kds6gg6x5dgcqy0v6jrcsdbgpgp")) (file-name (git-file-name name version)) (modules '((guix build utils))) - ;; Remove some available vendor modules. - ;; TODO: Pack all of them and remove vendor directory completely. (snippet - '(for-each - delete-file-recursively - (list "vendor/github.com/fatih/color" - "vendor/github.com/mitchellh/mapstructure" - "vendor/github.com/gobwas/glob" - "vendor/github.com/mitchellh/go-homedir" - "vendor/github.com/olekukonko/tablewriter" - "vendor/github.com/spf13/afero" - "vendor/github.com/urfave/cli" - "vendor/github.com/yuin/goldmark" - "vendor/golang.org/x/net/html" - "vendor/gopkg.in/ini.v1" - "vendor/gopkg.in/yaml.v2"))))) + #~(begin + ;; Module name has been changed upstream. + (substitute* (find-files "." "\\.go$") + (("github.com/antonmedv/expr") "github.com/expr-lang/expr")))))) (build-system go-build-system) (arguments - (list #:install-source? #f - #:import-path "github.com/errata-ai/vale")) + (list + #:install-source? #f + #:import-path "github.com/errata-ai/vale/cmd/vale" + #:unpack-path "github.com/errata-ai/vale" + #:phases + #~(modify-phases %standard-phases + ;; Disable tests requring network access: Get + ;; "https://raw.githubusercontent.com/errata-ai/styles/master/library.json": + ;; dial tcp: lookup raw.githubusercontent.com on [::1]:53: + ;; read udp [::1]:52621->[::1]:53: read: connection refused. + (add-after 'unpack 'disable-failing-tests + (lambda* (#:key tests? unpack-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" unpack-path) + (substitute* (find-files "." "\\_test.go$") + (("TestLibrary") "OffTestLibrary") + (("TestLocalComplete") "OffTestLocalComplete") + (("TestLocalDir") "OffTestLocalDir") + (("TestLocalOnlyStyles") "OffTestLocalOnlyStyles") + (("TestLocalZip") "OffTestLocalZip") + (("TestNoPkgFound") "OffTestNoPkgFound") + (("TestV3Pkg") "OffTestV3Pkg"))))) + ;; FIXME: Pattern embedded: cannot embed directory embedded: + ;; contains no embeddable files. + ;; + ;; This happens due to Golang can't determine the valid directory of + ;; the module which is sourced during setup environment phase, but + ;; easy resolved after coping to expected directory "vendor" within + ;; the current package, see details in Golang source: + ;; + ;; - URL: <https://github.com/golang/go/blob/> + ;; - commit: 82c14346d89ec0eeca114f9ca0e88516b2cda454 + ;; - file: src/cmd/go/internal/load/pkg.go#L2059 + (add-before 'build 'copy-input-to-vendor-directory + (lambda* (#:key unpack-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" unpack-path) + (mkdir "vendor") + (copy-recursively + (string-append + #$(this-package-native-input "go-github-com-jdkato-twine") + "/src/github.com") + "vendor/github.com")))) + ;; XXX: Workaround for go-build-system's lack of Go modules + ;; support. + (replace 'check + (lambda* (#:key tests? unpack-path #:allow-other-keys) + (when tests? + (with-directory-excursion (string-append "src/" unpack-path) + (setenv "HOME" "/tmp") + (invoke "go" "test" "-v" "./..."))))) + (add-before 'install 'remove-vendor-directory + (lambda* (#:key unpack-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" unpack-path) + (delete-file-recursively "vendor"))))))) (native-inputs - (list go-github-com-fatih-color - go-github-com-mitchellh-mapstructure + (list go-github-com-masterminds-sprig-v3 + go-github-com-adrg-strutil + go-github-com-adrg-xdg + go-github-com-bmatcuk-doublestar-v4 + go-github-com-d5-tengo-v2 + go-github-com-errata-ai-ini + go-github-com-errata-ai-regexp2 + go-github-com-expr-lang-expr go-github-com-gobwas-glob - ;; go-github-com-jdkato-prose - ;; go-github-com-jdkato-regexp - go-github-com-mitchellh-go-homedir + go-github-com-jdkato-twine + go-github-com-karrick-godirwalk + go-github-com-mholt-archiver-v3 + go-github-com-mitchellh-mapstructure + go-github-com-niklasfasching-go-org go-github-com-olekukonko-tablewriter - ;; go-github-com-remeh-sizedwaitgroup - go-github-com-spf13-afero - go-github-com-urfave-cli + go-github-com-otiai10-copy + go-github-com-pterm-pterm + go-github-com-remeh-sizedwaitgroup + go-github-com-spf13-pflag go-github-com-yuin-goldmark + go-golang-org-x-exp go-golang-org-x-net - go-gopkg-in-ini-v1 + go-golang-org-x-sys go-gopkg-in-yaml-v2)) (home-page "https://github.com/errata-ai/vale") (synopsis "Fully customizable syntax-aware linter that focuses on your style") @@ -1484,9 +1536,6 @@ community around it also has a list of style guides implemented with Vale in @url{https://github.com/errata-ai/styles, their styles repo}.") (license license:expat))) -(define-public go-github-com-errata-ai-vale - (deprecated-package "go-github-com-errata-ai-vale" vale)) - (define-public utf-8-lineseparator (package (name "utf-8-lineseparator") @@ -1562,9 +1611,6 @@ JSON for post-processing @end itemize") (license license:expat))) -(define-public go-github-com-aswinkarthik-csvdiff - (deprecated-package "go-github-com-aswinkarthik-csvdiff" csvdiff)) - (define-public miller (package (name "miller") @@ -1581,7 +1627,6 @@ JSON for post-processing (build-system go-build-system) (arguments (list - #:go go-1.19 #:install-source? #f #:import-path "github.com/johnkerl/miller/cmd/mlr" #:unpack-path "github.com/johnkerl/miller" diff --git a/gnu/packages/time.scm b/gnu/packages/time.scm index 2612201c11..27cea548ec 100644 --- a/gnu/packages/time.scm +++ b/gnu/packages/time.scm @@ -644,7 +644,6 @@ calls.") (build-system go-build-system) (arguments (list - #:go go-1.17 #:install-source? #f #:import-path "github.com/oz/tz")) (inputs diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 760b917768..fdc003731d 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -84,7 +84,9 @@ #:use-module (gnu packages time) #:use-module (gnu packages version-control) #:use-module (gnu packages base) - #:use-module (srfi srfi-1)) + #:use-module (srfi srfi-1) + #:use-module (srfi srfi-34) + #:use-module (srfi srfi-35)) (define-public libtasn1 (package @@ -390,7 +392,7 @@ bindings that were formerly provided as part of GnuTLS.") (modify-inputs (package-inputs guile-gnutls) (replace "guile" guile-2.2))))) -(define (target->openssl-target target) +(define (target->openssl-target pkg target) "Return the value to set CONFIGURE_TARGET_ARCH to when cross-compiling OpenSSL for TARGET." ;; Keep this code outside the build code, @@ -411,7 +413,10 @@ OpenSSL for TARGET." ((target-linux? target) "linux") (else - (error "unsupported openssl target kernel")))) + (raise (condition + (&package-unsupported-target-error + (package pkg) + (target target))))))) (arch (cond ((target-x86-32? target) @@ -438,7 +443,10 @@ OpenSSL for TARGET." ((target-64bit? target) "generic64") (else - (error "unsupported openssl target architecture"))))) + (raise (condition + (&package-unsupported-target-error + (package pkg) + (target target)))))))) (string-append kernel "-" arch)))) (define-public openssl-1.1 @@ -488,6 +496,7 @@ OpenSSL for TARGET." (setenv "CROSS_COMPILE" (string-append target "-")) (setenv "CONFIGURE_TARGET_ARCH" #$(target->openssl-target + this-package (%current-target-system)))))) #~()) #$@(if (target-hurd?) diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index eb72b415ee..2f6e6809d7 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -531,6 +531,14 @@ which will be used as a snippet in origin." (git-version "0.19.0" revision commit) #:commit commit))) +(define-public tree-sitter-prisma + (tree-sitter-grammar + "prisma" "Prisma" + "19zb3dkwp2kpyivygqxk8yph0jpl7hn9zzcry15mshn2n0rs9sih" + "1.4.0" + #:repository-url "https://github.com/victorhqc/tree-sitter-prisma" + #:license license:expat)) + (define-public tree-sitter-python (tree-sitter-grammar "python" "Python" diff --git a/gnu/packages/uml.scm b/gnu/packages/uml.scm index 77d6c30b6d..f957b2a5ae 100644 --- a/gnu/packages/uml.scm +++ b/gnu/packages/uml.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2019 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de> -;;; Copyright © 2022 jgart <jgart@dismail.de> +;;; Copyright © 2022, 2024 jgart <jgart@dismail.de> ;;; ;;; This file is part of GNU Guix. ;;; @@ -24,6 +24,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix utils) #:use-module (guix build-system ant) #:use-module (gnu packages graphviz) @@ -32,14 +33,15 @@ (define-public plantuml (package (name "plantuml") - (version "1.2023.7") + (version "1.2024.6") (source (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/plantuml/" - version "/plantuml-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/plantuml/plantuml/") + (commit (string-append "v" version)))) (sha256 (base32 - "0680hlhmwvzp1fw3zdsmy2x4szdhpdjgk028674fg3hwzwk5fv40")))) + "0h6hk34x5qc8cyqlw90wnakji8w6n9bykpr3dygvfwg2kvw5rhlv")))) (build-system ant-build-system) (arguments `(#:tests? #f ; no tests diff --git a/gnu/packages/unicode.scm b/gnu/packages/unicode.scm index fe188ed71d..5f8a3655b0 100644 --- a/gnu/packages/unicode.scm +++ b/gnu/packages/unicode.scm @@ -32,39 +32,44 @@ (define-public libunibreak (package (name "libunibreak") - (version "5.0") + (version "6.1") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/adah1972/libunibreak") (commit (string-append "libunibreak_" - (string-replace-substring version "." "_"))))) + (string-replace-substring version "." "_"))))) (file-name (git-file-name name version)) (sha256 (base32 - "0r5dndhwsiy65lmavz3vdgal9nl8g97hbmdjg6zyq3zh5hs87vwf")))) + "0mhkbji89cyjg4g1rviyprchxzpv8pmlmqw4m10cvgfjwmpmwa7k")))) (build-system gnu-build-system) (native-inputs - (list autoconf-wrapper - automake - libtool - ucd)) + (list autoconf-wrapper + automake + libtool + ucd)) (arguments `(#:parallel-tests? #f ; parallel tests cause non-deterministic - ; build failures - #:phases - (modify-phases %standard-phases - (add-before 'check 'pre-check - (lambda* (#:key inputs #:allow-other-keys) - (for-each (lambda (file) - (copy-file - (search-input-file inputs - (string-append "/share/ucd/auxiliary/" - file)) - (string-append "src/" file))) - '("LineBreakTest.txt" - "WordBreakTest.txt" - "GraphemeBreakTest.txt"))))))) + ;; see https://github.com/adah1972/libunibreak/issues/41 + ;; There is currently no plan to implement full Unicode 15.1 support for + ;; line breaking, mostly because tailoring for Brahmic scripts, as + ;; described in LB28a of UAX #14-51, is problematic within the current + ;; framework. + ;; #:phases + ;; (modify-phases %standard-phases + ;; (add-before 'check 'pre-check + ;; (lambda* (#:key inputs #:allow-other-keys) + ;; (for-each (lambda (file) + ;; (copy-file + ;; (search-input-file inputs + ;; (string-append "/share/ucd/auxiliary/" + ;; file)) + ;; (string-append "src/" file))) + ;; '("LineBreakTest.txt" + ;; "WordBreakTest.txt" + ;; "GraphemeBreakTest.txt"))))) + )) (home-page "https://vimgadgets.sourceforge.net/libunibreak/") (synopsis "Unicode line breaking and word breaking algorithms") (description diff --git a/gnu/packages/upnp.scm b/gnu/packages/upnp.scm index 6592f2fe7f..aab68a6414 100644 --- a/gnu/packages/upnp.scm +++ b/gnu/packages/upnp.scm @@ -6,7 +6,7 @@ ;;; Copyright © 2019 Jens Mølgaard <jens@zete.tk> ;;; Copyright © 2020 Jan Wielkiewicz <tona_kosmicznego_smiecia@interia.pl> ;;; Copyright © 2021 Efraim Flashner <efraim@flashner.co.il> -;;; Copyright © 2023 Ricardo Wurmus <rekado@elephly.net> +;;; Copyright © 2023, 2024 Ricardo Wurmus <rekado@elephly.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -177,7 +177,7 @@ It aims to be fully compliant with DLNA and UPnP-AV standards.") (define-public gerbera (package (name "gerbera") - (version "1.12.1") + (version "2.2.0") (source (origin (method git-fetch) @@ -186,7 +186,7 @@ It aims to be fully compliant with DLNA and UPnP-AV standards.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1jz3jpg6ja9vi5zykcdh410r07ysrn6g0kzyj0v7d3689jxp94lg")))) + (base32 "1pqqjwza9fs59n2x685yvfb0sdwigknfxc4ihh3phpqyg99427kk")))) (build-system cmake-build-system) (arguments (list @@ -197,6 +197,7 @@ It aims to be fully compliant with DLNA and UPnP-AV standards.") (inputs (list curl duktape + exiv2 ffmpeg file fmt diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 29401f87ff..cf7f7b0ad8 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1635,7 +1635,12 @@ lot easier.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0cgv7chxqkjaqmzi4691in26j2fm8r0vanw8xzb9cqnz6350wvvj")))) + (base32 "0cgv7chxqkjaqmzi4691in26j2fm8r0vanw8xzb9cqnz6350wvvj")) + (modules '((guix build utils))) + (snippet + '(begin (substitute* (find-files "." "^Cargo\\.toml$") + (("\"~([[:digit:]]+(\\.[[:digit:]]+)*)" _ version) + (string-append "\"^" version))))))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-anstyle" ,rust-anstyle-1) @@ -3810,7 +3815,7 @@ If several repos are related, it helps to see their status together.") (define-public ghq (package (name "ghq") - (version "1.1.7") + (version "1.6.2") (home-page "https://github.com/x-motemen/ghq") (source (origin (method git-fetch) @@ -3820,12 +3825,11 @@ If several repos are related, it helps to see their status together.") (file-name (git-file-name name version)) (sha256 (base32 - "155sfmhmh4ia3iinm1s8fk7fxyn5dxdryad9xkbg7mr3i3ikqjwh")))) + "00rrm0gykmj60i0lnr4js6d4193c92zm3cimimb03xva4n9frvxw")))) (build-system go-build-system) (arguments (list #:install-source? #f - #:go go-1.21 #:import-path "github.com/x-motemen/ghq" #:phases #~(modify-phases %standard-phases diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 382ad0ba59..ddfa3a2b72 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2711,40 +2711,31 @@ projects while introducing many more.") (define-public smplayer (package (name "smplayer") - (version "21.10.0") + (version "23.12.0") (source (origin - (method url-fetch) - (uri (string-append - "mirror://sourceforge/smplayer/SMPlayer/" version - "/smplayer-" version ".tar.bz2")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/smplayer-dev/smplayer") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 - "12nvcl0cfix1xay9hfi7856vg4lpv8y5b0a22212bsjbvl5g22rc")))) + (base32 "0yrm57rib910h9m4avhg6mkmkzy9xjb3f185c5zr6jls100az8h1")))) (build-system qt-build-system) (native-inputs (list qttools-5)) (inputs - (list bash-minimal qtbase-5 zlib mpv)) + (list bash-minimal + qtbase-5 + qtdeclarative-5 + zlib + mpv)) (arguments (list #:tests? #false ; no tests #:make-flags #~(list (string-append "PREFIX=" #$output) - (string-append "CC=" #+(cc-for-target)) - ;; A KLUDGE to turn off invoking lrelease on the - ;; project for now, because it fails consistently - ;; with "WARNING: Could not find qmake spec - ;; 'default'". See below. - "LRELEASE=true") + (string-append "CC=" #+(cc-for-target))) #:phases #~(modify-phases %standard-phases (delete 'configure) - ;; Due to the above, we must run lrelease separately on each .ts file - ;; (as opposed to running `lrelease-pro smplayer.pro` for the entire - ;; project, as the Makefile does normally without the above kludge). - (add-after 'build 'compile-ts-files - (lambda _ - (for-each (lambda (file) - (invoke "lrelease" file)) - (find-files "./" "\\.ts$")))) (add-after 'install 'wrap-executable (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -2984,8 +2975,7 @@ To load this plugin, specify the following option when starting mpv: (delete-file "orfondl"))))) (build-system go-build-system) (arguments - (list #:go go-1.19 - #:install-source? #f + (list #:install-source? #f #:import-path "github.com/badlogic/orfondl" #:phases #~(modify-phases %standard-phases @@ -3138,7 +3128,7 @@ YouTube.com and many more sites.") (define-public yt-dlp (package (name "yt-dlp") - (version "2024.05.27") + (version "2024.07.09") (source (origin (method git-fetch) @@ -3147,7 +3137,7 @@ YouTube.com and many more sites.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "13j6vg0kxfw3hppq7gzbz2d72g415071gh5arkwzj902rh0c7777")))) + (base32 "1zw8zaihfx6fg1l9ynwm0d4zy6k30jwi7qbq9ylsl93yg1a73js9")))) (build-system pyproject-build-system) (arguments `(#:tests? ,(not (%current-target-system)) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 4ff9676e79..061748bb4a 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013-2017, 2020-2022 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2015, 2016, 2017, 2018 Mark H Weaver <mhw@netris.org> -;;; Copyright © 2016-2021, 2023 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2016-2021, 2023, 2024 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2017 Alex Vong <alexvong1995@gmail.com> ;;; Copyright © 2017 Andy Patterson <ajpatter@uwaterloo.ca> @@ -33,6 +33,7 @@ ;;; Copyright © 2023 Sharlatan Hellseher <sharlatanus@gmail.com> ;;; Copyright © 2023, 2024 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org> +;;; Copyright © 2024 Raven Hallsby <karl@hallsby.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -221,8 +222,11 @@ "share/qemu/opensbi-riscv64-generic-fw_dynamic.bin")) (seabios (search-input-file %build-inputs "share/qemu/bios.bin")) - (ipxe (search-input-file %build-inputs - "share/qemu/pxe-virtio.rom")) + (ipxe + #$@(if (this-package-input "ipxe-qemu") + #~((search-input-file %build-inputs + "share/qemu/pxe-virtio.rom")) + #~((string-append #$output "/share/qemu")))) (out #$output)) (list (string-append "--cc=" gcc) ;; Some architectures insist on using HOST_CC. @@ -255,8 +259,11 @@ (let* ((seabios (dirname (search-input-file inputs "share/qemu/bios.bin"))) (seabios-firmwares (find-files seabios "\\.bin$")) - (ipxe (dirname (search-input-file - inputs "share/qemu/pxe-virtio.rom"))) + (ipxe + #$@(if (this-package-input "ipxe-qemu") + #~((dirname (search-input-file + inputs "share/qemu/pxe-virtio.rom"))) + #~((string-append #$output "/share/qemu")))) (ipxe-firmwares (find-files ipxe "\\.rom$")) (openbios (search-input-file inputs "share/qemu/openbios-ppc")) @@ -285,6 +292,28 @@ "\"~a\",~%" file)) allowed-differences) (close-port allowed-differences-whitelist)))) + ;; If the ipxe firmware isn't available, remove it from the list + ;; of files expected to be available and remove some of the tests. + #$@(if (not (this-package-input "ipxe-qemu")) + #~((add-after 'unpack 'dont-require-ipxe-firmware + (lambda _ + (substitute* "pc-bios/meson.build" + ((".*(pxe|efi)-.*") "")) + (substitute* "tests/qtest/meson.build" + ((".*qom-test.*") "") + ((".*qos-test.*") "") + ((".*test-hmp.*") "") + ((".*'pxe-test':.*") "") + ((",? ?'boot-serial-test',?") "") + ((",? ?'endianness-test',?") "") + ((",? ?'prom-env-test',?") "") + ((",? ?'pxe-test',?") "") + ((",? ?'test-filter-mirror',?") "") + ((",? ?'test-filter-redirector',?") "") + ((",? ?'test-netfilter',?") "") + ;; Fix the slow_qtests array after the substitutions + ((" : .*") ""))))) + #~()) (add-after 'unpack 'extend-test-time-outs (lambda _ ;; These tests can time out on heavily-loaded and/or slow storage. @@ -449,41 +478,44 @@ exec smbd $@"))) (rename-file (string-append out "/share/doc/qemu") (string-append qemu-doc "/html")))))))) (inputs - (list alsa-lib - bash-minimal - dtc - glib - gtk+ - ipxe-qemu - libaio - libcacard ;smartcard support - attr libcap-ng ;VirtFS support - libdrm - libepoxy - libjpeg-turbo - libpng - libseccomp - libslirp - liburing - libusb ;USB pass-through support - mesa - ncurses - openbios-qemu-ppc - opensbi-qemu - ;; ("pciutils" ,pciutils) - pixman - pulseaudio - sdl2 - seabios-qemu - spice - usbredir - util-linux - vde2 - virglrenderer - - ;; Formats to support for .qcow2 (and possibly other) compression. - zlib - `(,zstd "lib"))) + (append + (if (supported-package? ipxe-qemu) + (list ipxe-qemu) + '()) + (list alsa-lib + bash-minimal + dtc + glib + gtk+ + libaio + libcacard ;smartcard support + attr libcap-ng ;VirtFS support + libdrm + libepoxy + libjpeg-turbo + libpng + libseccomp + libslirp + liburing + libusb ;USB pass-through support + mesa + ncurses + openbios-qemu-ppc + opensbi-qemu + ;; pciutils + pixman + pulseaudio + sdl2 + seabios-qemu + spice + usbredir + util-linux + vde2 + virglrenderer + + ;; Formats to support for .qcow2 (and possibly other) compression. + zlib + `(,zstd "lib")))) (native-inputs ;; Note: acpica is here only to pretty-print firmware differences with IASL ;; (see the replace-firmwares phase above). @@ -1663,7 +1695,8 @@ virtualization library.") version ".tar.gz")) (sha256 (base32 - "18lhlnd3gmyzhbnjc16gdyzhjcd33prlxnca4xlidiidngbq21lm")))) + "18lhlnd3gmyzhbnjc16gdyzhjcd33prlxnca4xlidiidngbq21lm")) + (patches (search-patches "virt-manager-fix-gtk-cursor-theme-backtace.patch")))) (build-system python-build-system) (arguments (list #:use-setuptools? #f ; uses custom distutils 'install' command @@ -2288,7 +2321,7 @@ Open Container Initiative (OCI) image layout and its tagged images.") (define-public skopeo (package (name "skopeo") - (version "1.15.1") + (version "1.15.2") (source (origin (method git-fetch) (uri (git-reference @@ -2297,7 +2330,7 @@ Open Container Initiative (OCI) image layout and its tagged images.") (file-name (git-file-name name version)) (sha256 (base32 - "0fhw3jrbklpz7kb1kdwn2hg3v2jyyz30710wkd0wlpfz4fyzmzb6")))) + "13y1fmv78hh5ycm7xlsg851y17s223q13b9srksnq6jcwgprqkm8")))) (build-system gnu-build-system) (native-inputs (list go-1.21 diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index e1d9657755..199f523461 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -983,30 +983,32 @@ private network between hosts on the internet.") (define-public sshuttle (package (name "sshuttle") - (version "0.78.5") + (version "1.1.2") (source (origin - (method url-fetch) - (uri (pypi-uri name version)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/sshuttle/sshuttle") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 - "0vp13xwrhx4m6zgsyzvai84lkq9mzkaw47j58dk0ll95kaymk2x8")))) - (build-system python-build-system) + (base32 "01hd7z7gxkc2bjxndnv5dw1x98qcakxli9k8w285iq2b7d786f7f")))) + (build-system pyproject-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-FHS-file-names - (lambda _ - (substitute* "sshuttle/client.py" - (("/usr/bin/env") (which "env"))) - (substitute* "sshuttle/ssh.py" - (("/bin/sh") "sh")) - #t))))) + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-FHS-file-names + (lambda _ + (substitute* "sshuttle/client.py" + (("/usr/bin/env") (which "env"))) + (substitute* "sshuttle/ssh.py" + (("/bin/sh") "sh"))))))) (native-inputs (list python-setuptools-scm ;; For tests only. python-flake8 python-mock + python-poetry-core python-pytest-cov python-pytest-runner)) (home-page "https://github.com/sshuttle/sshuttle") diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 3988621835..e406e6e968 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -148,6 +148,7 @@ #:use-module (gnu packages golang) #:use-module (gnu packages golang-build) #:use-module (gnu packages golang-check) + #:use-module (gnu packages golang-compression) #:use-module (gnu packages golang-web) #:use-module (gnu packages golang-xyz) #:use-module (gnu packages gperf) @@ -338,51 +339,60 @@ and its related documentation.") (define-public miniflux (package (name "miniflux") - (version "2.0.46") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/miniflux/v2") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1qv95kipjlg374kiq6gssh5jsb5arahq4jsb7vkg3njnx0ldwvkb")))) + (version "2.1.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/miniflux/v2") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1m1rcxcjswni3adgjkn3hvb59cbfdh9cl22d5qqwn0lxs8mgqhfl")))) (build-system go-build-system) (arguments - (list #:go go-1.19 - #:install-source? #f - #:import-path "miniflux.app" - #:build-flags - #~(list (string-append - "-ldflags= -X miniflux.app/version.Version=" #$version)) - #:phases - #~(modify-phases %standard-phases - (add-before 'build 'disable-cgo - (lambda _ - (setenv "CGO_ENABLED" "0"))) - (add-after 'install 'install-manpage - (lambda* (#:key import-path #:allow-other-keys) - (let ((man1 (string-append #$output "/share/man/man1/")) - (page (format #f "src/~a/miniflux.1" import-path))) - (install-file page man1)))) - (add-after 'install-manpage 'rename-binary - (lambda _ - (let ((bindir (string-append #$output "/bin/"))) - (rename-file (string-append bindir "miniflux.app") - (string-append bindir "miniflux")))))))) + (list + #:go go-1.22 + #:install-source? #f + #:import-path "miniflux.app/v2" + #:build-flags + #~(list (string-append + "-ldflags= -X miniflux.app/v2/internal/version.Version=" + #$version)) + #:phases + #~(modify-phases %standard-phases + ;; XXX: Replace when go-build-system supports nested path. + (replace 'check + (lambda* (#:key import-path tests? #:allow-other-keys) + (when tests? + (with-directory-excursion (string-append "src/" import-path) + (invoke "go" "test" "-v" "./..."))))) + (add-after 'install 'install-manpage + (lambda* (#:key import-path #:allow-other-keys) + (let ((man1 (string-append #$output "/share/man/man1/")) + (page (format #f "src/~a/miniflux.1" import-path))) + (install-file page man1)))) + (add-after 'install-manpage 'rename-binary + (lambda _ + (let ((bindir (string-append #$output "/bin/"))) + (rename-file (string-append bindir "v2") + (string-append bindir "miniflux")))))))) (inputs - (list go-github-com-coreos-go-oidc-v3 - go-github-com-go-telegram-bot-api-telegram-bot-api + (list go-github-com-abadojack-whatlanggo + go-github-com-andybalholm-brotli + go-github-com-coreos-go-oidc-v3 + go-github-com-go-webauthn-webauthn go-github-com-gorilla-mux go-github-com-lib-pq - go-github-com-matrix-org-gomatrix go-github-com-prometheus-client-golang go-github-com-puerkitobio-goquery - go-github-com-rylans-getlang go-github-com-tdewolff-minify-v2 go-github-com-yuin-goldmark + go-golang-org-x-crypto + go-golang-org-x-net + go-golang-org-x-oauth2 go-golang-org-x-term + go-golang-org-x-text go-mvdan-cc-xurls)) (home-page "https://miniflux.app/") (synopsis "Minimalist and opinionated feed reader") @@ -397,7 +407,7 @@ and its related documentation.") @item Use only modern vanilla Javascript (ES6 and Fetch API) @item Single binary compiled statically without dependency @item The number of features is voluntarily limited -@end itemize\n") +@end itemize") (license license:asl2.0))) (define-public mod-wsgi @@ -458,24 +468,24 @@ replacing them with data URIs.") (define-public monolith (package (name "monolith") - (version "2.7.0") + (version "2.8.1") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Y2Z/monolith.git") + (url "https://github.com/Y2Z/monolith") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0ccwjsp8gdgp0wafc3zvlfmx3f58axc1k1ac80qha3g60xccqn56")))) + (base32 "0xr63302yb5k9c2sihd1iy97j5c44d4jrzfaiwm81d9li577ih58")))) (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-atty" ,rust-atty-0.2) - ("rust-base64" ,rust-base64-0.13) + ("rust-base64" ,rust-base64-0.21) ("rust-chrono" ,rust-chrono-0.4) ("rust-clap" ,rust-clap-3) - ("rust-cssparser" ,rust-cssparser-0.29) + ("rust-cssparser" ,rust-cssparser-0.33) ("rust-encoding-rs" ,rust-encoding-rs-0.8) ("rust-html5ever" ,rust-html5ever-0.24) ("rust-percent-encoding" ,rust-percent-encoding-2) @@ -5449,7 +5459,7 @@ you'd expect.") go-github-com-elliotchance-orderedmap go-github-com-fatih-color go-github-com-goccy-go-json - go-github-com-goccy-yaml + go-github-com-goccy-go-yaml go-github-com-jinzhu-copier go-github-com-magiconair-properties go-github-com-pelletier-go-toml-v2 diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 505ce09c1a..11744f1196 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -73,6 +73,8 @@ ;;; Copyright © 2024 James Smith <jsubuntuxp@disroot.org> ;;; Copyright © 2024 bigbug <bigbookofbug@proton.me> ;;; Copyright © 2024 dan <i@dan.games> +;;; Copyright © 2024 Wamm K. D. <jaft.r@outlook.com> +;;; Copyright © 2024 Ashish SHUKLA <ashish.is@lostca.se> ;;; ;;; This file is part of GNU Guix. ;;; @@ -145,6 +147,7 @@ #:use-module (gnu packages logging) #:use-module (gnu packages lua) #:use-module (gnu packages man) + #:use-module (gnu packages maths) #:use-module (gnu packages mpd) #:use-module (gnu packages pciutils) #:use-module (gnu packages music) @@ -2305,7 +2308,7 @@ core/thread.") (define-public mako (package (name "mako") - (version "1.8.0") + (version "1.9.0") (source (origin (method git-fetch) (uri (git-reference @@ -2314,7 +2317,7 @@ core/thread.") (file-name (git-file-name name version)) (sha256 (base32 - "05g1gp61qd9n9w4lq925i4wgryagvah6x489g17j7rnw59q4qhdi")))) + "0wcyhnpah1g5qpixfwlpybsjcl22iv39jrxlbi84xv2gfyi2vmj2")))) (build-system meson-build-system) (arguments (list #:phases @@ -3910,3 +3913,25 @@ configuration.")))) for short) for X11 and Wayland, that goes to great lengths to be both CPU and battery efficient---polling is only done when absolutely necessary.") (license license:expat))) + +(define-public wf-config + (package + (name "wf-config") + (version "0.8.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url (string-append "https://github.com/WayfireWM/" name "/")) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 (base32 + "07x6dapv2xyg0cn44dd2faw5gpk7mwfpbkpld9kyiaa9d44362z1")))) + (build-system meson-build-system) + (native-inputs (list pkg-config)) + (inputs (list glm libxml2 wlroots libevdev)) + (home-page "https://github.com/WayfireWM/wf-config") + (synopsis "Library for managing configuration files for Wayfire") + (description "The package provides a library for managing the +configuration files of Wayifre. It can set key and mouse bindings, +configure input, and customize Wayfire plugins.") + (license license:expat))) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 9e1e9fbc6f..4c12835b24 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -396,7 +396,7 @@ with X11 or Wayland, or in a text terminal with ncurses.") qtdeclarative-5 qtwayland-5 wayland - knotifications)) + knotifications-5)) (native-inputs (list extra-cmake-modules qttools-5)) (synopsis "Clipboard manager with advanced features") diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index c6ddae50ae..85edcf0f7d 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -33,6 +33,7 @@ ;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net> ;;; Copyright © 2021 David Larsson <david.larsson@selfhosted.xyz> ;;; Copyright © 2021 Matthew James Kraai <kraai@ftbfs.org> +;;; Copyright © 2024 gemmaro <gemmaro.dev@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -76,6 +77,7 @@ #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix build-system cmake) + #:use-module (guix build-system copy) #:use-module (guix build-system gnu) #:use-module (guix build-system meson) #:use-module (guix build-system perl) @@ -1953,3 +1955,41 @@ XML data to JSON and other formats.") (description "This package provides a Python library to convert XML to @code{OrderedDict}.") (license license:expat))) + +(define-public xml-namespace-xsd + (package + (name "xml-namespace-xsd") + (version "2009-01") + (source + (origin + (method url-fetch) + (uri (string-append "https://www.w3.org/" + (string-replace-substring version "-" "/") + "/xml.xsd")) + (sha256 + (base32 "0agqmxbhk2q9xa38m02z7ggbb124z6avnqyhz8k43iicqhv1fw6c")))) + (build-system copy-build-system) + (arguments + (list + #:install-plan #~'(("xml.xsd" "/xml/dtd/namespace/xml.xsd") + ("catalog.xml" "/xml/dtd/namespace/catalog.xml")) + #:phases #~(modify-phases %standard-phases + (add-before 'install 'create-catalog + (lambda _ + (invoke "xmlcatalog" + "--noout" + "--create" + "--add" + "uri" + "http://www.w3.org/2001/xml.xsd" + "xml.xsd" + "catalog.xml")))))) + (native-inputs (list libxml2)) + (home-page "https://www.w3.org/XML/1998/namespace") + (synopsis "XML Schema for XML namespace") + (description + "This package provides an XML Schema and its catalog. The schema constrains the +syntax of @code{xml:lang}, @code{xml:spec}, @code{xml:base}, and @code{xml:id} in the +schema language defined by the XML Schema Recommendation Second Edition of 28 October +2004.") + (license license:w3c))) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index c13a1f4215..6b953ef152 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -6158,7 +6158,7 @@ basic eye-candy effects.") (define-public xpra (package (name "xpra") - (version "6.0.1") + (version "6.0.2") (source (origin (method git-fetch) @@ -6167,7 +6167,7 @@ basic eye-candy effects.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0l92zscy1kjb0bpsdd8r2mchv2gks0krz6dj34s65c34zwa1rwg6")) + (base32 "176qxrksgr07jhrlny3zxybnvf091kxkfmfnv9ci3h2k1nbwqh2x")) (patches (search-patches "xpra-6.0-systemd-run.patch" "xpra-6.0-install_libs.patch")))) (build-system python-build-system) diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm index d0b9728d4a..63e2011ce3 100644 --- a/gnu/services/desktop.scm +++ b/gnu/services/desktop.scm @@ -1785,6 +1785,22 @@ rules." "powerdevil" "plasma-firewall")))) +(define (plasma-dbus-service config) + "Return the list of KDE Plasma dependencies that provide D-Bus services." + (let ((plasma-plasma (plasma-package config))) + (map (lambda (name) + ((package-direct-input-selector name) plasma-plasma)) + '("plasma-desktop" + "plasma-workspace" + "kactivitymanagerd" + "plasma-disks" + "kinfocenter" + "libksysguard" + "ktexteditor" + "powerdevil" + "kwallet" + "plasma-firewall")))) + ;; see https://bugs.kde.org/show_bug.cgi?id=456210 ;; if `kde' no exits, fallback to `other', and then unlock lockscreen not work, ;; so add it. @@ -1799,6 +1815,8 @@ rules." (extensions (list (service-extension polkit-service-type plasma-polkit-settings) + (service-extension dbus-root-service-type + plasma-dbus-service) (service-extension pam-root-service-type plasma-pam-services) (service-extension profile-service-type diff --git a/gnu/services/sddm.scm b/gnu/services/sddm.scm index 48695e2806..92d64cc599 100644 --- a/gnu/services/sddm.scm +++ b/gnu/services/sddm.scm @@ -33,6 +33,8 @@ #:use-module (guix gexp) #:use-module (guix records) #:use-module (guix deprecation) + #:use-module (guix utils) + #:use-module (guix packages) #:export (sddm-configuration sddm-configuration? sddm-service-type @@ -165,8 +167,13 @@ Relogin=" (if (sddm-configuration-relogin? config) (define (sddm-shepherd-service config) "Return a <shepherd-service> for sddm with CONFIG." + (define sddm (sddm-configuration-sddm config)) + (define qt6? (version-prefix? + "6" + (package-version (lookup-package-input sddm "qtbase")))) + (define sddm-command - #~(list (string-append #$(sddm-configuration-sddm config) "/bin/sddm"))) + #~(list (string-append #$sddm "/bin/sddm"))) (list (shepherd-service (documentation "SDDM display manager.") @@ -179,8 +186,12 @@ Relogin=" (if (sddm-configuration-relogin? config) (cons* "XDG_DATA_DIRS=/run/current-system/profile/share" "XDG_CONFIG_DIRS=/run/current-system/profile/etc/xdg" - "QT_PLUGIN_PATH=/run/current-system/profile/lib/qt5/plugins" - "QML2_IMPORT_PATH=/run/current-system/profile/lib/qt5/qml" + #$(string-append "QT_PLUGIN_PATH=/run/current-system/profile/lib/qt" + (if qt6? "6" "5") + "/plugins") + #$(string-append "QML" (if qt6? "" "2") + "_IMPORT_PATH=/run/current-system/profile/lib/qt" + (if qt6? "6" "5") "/qml") (default-environment-variables)))) (stop #~(make-kill-destructor))))) diff --git a/gnu/services/web.scm b/gnu/services/web.scm index ee3499e5cd..2d24b3c437 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -830,7 +830,7 @@ of index files." #~(lambda _ (invoke #$nginx-binary "-c" #$config-file #$@args) (match '#$args - (("-s" . _) #f) + (("-s" . _) #t) (_ ;; When FILE is true, we cannot be sure that PID-FILE will ;; be created, so assume it won't show up. When FILE is @@ -857,11 +857,11 @@ This has the effect of killing old worker processes and starting new ones, using the same configuration file. It is useful for situations where the same nginx configuration file can point to different things after a reload, such as renewed TLS certificates, or @code{include}d files.") - (procedure (nginx-action "-s" "reload"))) + (procedure (nginx-action "-p" run-directory "-s" "reload"))) (shepherd-action (name 'reopen) (documentation "Re-open log files.") - (procedure (nginx-action "-s" "reopen")))))))))) + (procedure (nginx-action "-p" run-directory "-s" "reopen")))))))))) (define nginx-service-type (service-type (name 'nginx) diff --git a/gnu/tests/base.scm b/gnu/tests/base.scm index acba1ebd25..715b9036f9 100644 --- a/gnu/tests/base.scm +++ b/gnu/tests/base.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2022 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2016-2020, 2022, 2024 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2022 Marius Bakke <marius@gnu.org> @@ -200,14 +200,17 @@ info --version") (test-assert "shepherd services" (let ((services (marionette-eval '(begin - (use-modules (gnu services herd)) + (use-modules (gnu services herd) + (srfi srfi-1)) - (map (compose car live-service-provision) - (current-services))) + (append-map live-service-provision + (current-services))) marionette))) (lset= eq? (pk 'services services) - '(root #$@(operating-system-shepherd-service-names os))))) + '(root + shepherd + #$@(operating-system-shepherd-service-names os))))) (test-equal "libc honors /etc/localtime" -7200 ;CEST = GMT+2 diff --git a/gnu/tests/emacs.scm b/gnu/tests/emacs.scm new file mode 100644 index 0000000000..f15eec70db --- /dev/null +++ b/gnu/tests/emacs.scm @@ -0,0 +1,101 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2024 Liliana Marie Prikler <liliana.prikler@gmail.com> +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. + +(define-module (gnu tests emacs) + #:use-module (gnu tests) + #:use-module (gnu packages emacs) + #:use-module (gnu packages vim) + #:use-module (gnu services) + #:use-module (gnu system) + #:use-module (gnu system vm) + #:use-module (guix packages) + #:use-module (guix gexp) + #:use-module (srfi srfi-1) + #:export (%test-emacs-native-comp-replacable)) + +(define (run-native-comp-replacable-test old-emacs new-emacs) + (define vm (virtual-machine (marionette-operating-system %simple-os))) + + (define test + (with-imported-modules '((gnu build marionette)) + #~(begin + (use-modules (gnu build marionette) + (srfi srfi-1) + (srfi srfi-64)) + + (define marionette (make-marionette (list #$vm))) + (define (marionette-emacs-eval emacs code) + (marionette-eval + `(begin + (use-modules (ice-9 rdelim) (ice-9 popen)) + (read-line + (open-pipe* + OPEN_READ + ,emacs "--batch" + ,(string-append "--eval=" code)))) + marionette)) + + (define (emacs-native-comp-dir emacs) + (marionette-emacs-eval emacs "(princ comp-native-version-dir)")) + (define (emacs-abi-hash emacs) + (marionette-emacs-eval emacs "(princ comp-abi-hash)")) + (define (emacs-effective-version emacs) + (marionette-emacs-eval + emacs + "(princ + (format \"%s.%s\" emacs-major-version emacs-minor-version))")) + + (define old-emacs-bin #$(file-append old-emacs "/bin/emacs")) + (define new-emacs-bin #$(file-append new-emacs "/bin/emacs")) + + (test-runner-current (system-test-runner #$output)) + (test-begin "emacs-native-comp-replacable") + (test-equal "comp-abi-hash" + (emacs-abi-hash old-emacs-bin) + (emacs-abi-hash new-emacs-bin)) + (test-equal "native-comp-dir" + (emacs-native-comp-dir old-emacs-bin) + (emacs-native-comp-dir new-emacs-bin)) + (test-assert "old emacs has hierarchical layout" + (file-exists? + (string-append #$old-emacs "/lib/emacs/" + (emacs-effective-version old-emacs-bin) + "/native-lisp/" + (emacs-native-comp-dir old-emacs-bin) + "/preloaded/emacs-lisp/comp.eln"))) + (test-assert "new emacs has hierarchical layout" + (file-exists? + (string-append #$new-emacs "/lib/emacs/" + (emacs-effective-version new-emacs-bin) + "/native-lisp/" + (emacs-native-comp-dir new-emacs-bin) + "/preloaded/emacs-lisp/comp.eln"))) + (test-end)))) + + (gexp->derivation "emacs-native-comp-compatible" test)) + +(define (package-without-replacement pkg) + (package (inherit pkg) (replacement #f))) + +(define %test-emacs-native-comp-replacable + (system-test + (name "emacs-native-comp") + (description "Test whether an emacs replacement (if any) is valid.") + (value (run-native-comp-replacable-test + (package-without-replacement emacs) + emacs)))) |